Can census (#3935)

* Added 3 years of Canada Census formats

* Added tests for Canadian census data

* Fixed month-day order and moved Canadian to bottom of default

* a bit of cleanup to the spacing, and comments

* Fix style for spacing

* Added two additional years of Canada census

3 files changed, 769 insertions, 0 deletions

diff --git a/tests/app/Census/CensusColumnConditionCanTest.php b/tests/app/Census/CensusColumnConditionCanTest.php
new file mode 100644
index 0000000000..f7ad36bcbf
--- /dev/null
+++ b/tests/app/Census/CensusColumnConditionCanTest.php
@@ -0,0 +1,445 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2021 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
+use Fisharebest\Webtrees\TestCase;
+use Illuminate\Support\Collection;
+
+/**
+ * Test harness for the class CensusColumnConditionCan
+ * Copied from CensusColumnConditionUs
+ */
+class CensusColumnConditionCanTest extends TestCase
+{
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testNoSpouseFamiliesMale(): void
+    {
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('M');
+        $individual->method('spouseFamilies')->willReturn(new Collection());
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
+
+        $census = self::createMock(CensusInterface::class);
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        $column = new CensusColumnConditionCan($census, '', '');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testNoSpouseFamiliesFemale(): void
+    {
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('F');
+        $individual->method('spouseFamilies')->willReturn(new Collection());
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
+
+        $census = self::createMock(CensusInterface::class);
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        $column = new CensusColumnConditionCan($census, '', '');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testNoFamilyFactsMale(): void
+    {
+        $family = self::createMock(Family::class);
+        $family->method('getMarriageDate')->willReturn(new Date(''));
+        $family->method('facts')->with(['MARR'])->willReturn(new Collection());
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
+        $individual->method('sex')->willReturn('M');
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testNoFamilyFactsFemale(): void
+    {
+        $family = self::createMock(Family::class);
+        $family->method('getMarriageDate')->willReturn(new Date(''));
+        $family->method('facts')->with(['MARR'])->willReturn(new Collection());
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
+        $individual->method('sex')->willReturn('F');
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testSpouseDeadMale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $spouse = self::createMock(Individual::class);
+        $spouse->method('getDeathDate')->willReturn(new Date('1820'));
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('M');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('W', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testSpouseDeadFemale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $spouse = self::createMock(Individual::class);
+        $spouse->method('getDeathDate')->willReturn(new Date('1820'));
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )
+            ->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+        $family->expects(self::once())->method('spouse')->willReturn($spouse);
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('F');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('W', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testNoFamilyUnmarriedMale(): void
+    {
+        $family = self::createMock(Family::class);
+        $family->method('getMarriageDate')->willReturn(new Date(''));
+        $family->method('facts')->with(['MARR'])->willReturn(new Collection());
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('M');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
+
+        $census = self::createMock(CensusInterface::class);
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        $column = new CensusColumnConditionCan($census, '', '');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testNoFamilyUnmarriedFemale(): void
+    {
+        $family = self::createMock(Family::class);
+        $family->method('getMarriageDate')->willReturn(new Date(''));
+        $family->method('facts')->with(['MARR'])->willReturn(new Collection());
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('F');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1800'));
+
+        $census = self::createMock(CensusInterface::class);
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        $column = new CensusColumnConditionCan($census, '', '');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testChildMale(): void
+    {
+        $family = self::createMock(Family::class);
+        $family->method('getMarriageDate')->willReturn(new Date(''));
+        $family->method('facts')->with(['MARR'])->willReturn(new Collection());
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('M');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
+
+        $census = self::createMock(CensusInterface::class);
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        $column = new CensusColumnConditionCan($census, '', '');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testChildFemale(): void
+    {
+        $family = self::createMock(Family::class);
+        $family->method('getMarriageDate')->willReturn(new Date(''));
+        $family->method('facts')->with(['MARR'])->willReturn(new Collection());
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('F');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('1820'));
+
+        $census = self::createMock(CensusInterface::class);
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        $column = new CensusColumnConditionCan($census, '', '');
+
+        self::assertSame('S', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testDivorcedMale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('M');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('D', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testDivorcedFemale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection([$fact])
+            );
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('F');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('D', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testMarriedMale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('M');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('M', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionCan
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testMarriedFemale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('F');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionCan($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('M', $column->generate($individual, $individual));
+    }
+}
diff --git a/tests/app/Census/CensusOfCanada1911Test.php b/tests/app/Census/CensusOfCanada1911Test.php
new file mode 100644
index 0000000000..48d2aa8620
--- /dev/null
+++ b/tests/app/Census/CensusOfCanada1911Test.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2021 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\TestCase;
+
+/**
+ * Test harness for the class CensusOfCanada1911
+ */
+class CensusOfCanada1911Test extends TestCase
+{
+    /**
+     * Test the census place and date
+     *
+     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1911
+     *
+     * @return void
+     */
+    public function testPlaceAndDate(): void
+    {
+        $census = new CensusOfCanada1911();
+
+        self::assertSame('Canada', $census->censusPlace());
+        self::assertSame('01 JUN 1911', $census->censusDate());
+    }
+
+    /**
+     * Test the census columns
+     *
+     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1911
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
+     *
+     * @return void
+     */
+    public function testColumns(): void
+    {
+        $census  = new CensusOfCanada1911();
+        $columns = $census->columns();
+
+        self::assertCount(35, $columns);
+        self::assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[1]);
+        self::assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
+        self::assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[3]);
+        self::assertInstanceOf(CensusColumnConditionCan::class, $columns[4]);
+        self::assertInstanceOf(CensusColumnBirthMonth::class, $columns[5]);
+        self::assertInstanceOf(CensusColumnBirthYear::class, $columns[6]);
+        self::assertInstanceOf(CensusColumnAge::class, $columns[7]);
+        self::assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[8]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[9]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[10]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        self::assertInstanceOf(CensusColumnNationality::class, $columns[12]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[13]);
+        self::assertInstanceOf(CensusColumnOccupation::class, $columns[14]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[15]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[16]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[17]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[18]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[19]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[20]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[21]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[22]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[23]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[24]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[25]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[26]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[27]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[28]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[29]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[30]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[31]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[32]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[33]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[34]);
+
+        self::assertSame('Name', $columns[0]->abbreviation());
+        self::assertSame('Address', $columns[1]->abbreviation());
+        self::assertSame('Sex', $columns[2]->abbreviation());
+        self::assertSame('Relation', $columns[3]->abbreviation());
+        self::assertSame('S/M/W/D/L', $columns[4]->abbreviation());
+        self::assertSame('Month', $columns[5]->abbreviation());
+        self::assertSame('Year', $columns[6]->abbreviation());
+        self::assertSame('Age', $columns[7]->abbreviation());
+        self::assertSame('Birth Loc', $columns[8]->abbreviation());
+        self::assertSame('Yr. immigrated', $columns[9]->abbreviation());
+        self::assertSame('Yr. naturalized', $columns[10]->abbreviation());
+        self::assertSame('Origin', $columns[11]->abbreviation());
+        self::assertSame('Nationality', $columns[12]->abbreviation());
+        self::assertSame('Religion', $columns[13]->abbreviation());
+        self::assertSame('Occupation', $columns[14]->abbreviation());
+        self::assertSame('Means', $columns[15]->abbreviation());
+        self::assertSame('Employer', $columns[16]->abbreviation());
+        self::assertSame('Employee', $columns[17]->abbreviation());
+        self::assertSame('Work on OwnAcct', $columns[18]->abbreviation());
+        self::assertSame('Where employed', $columns[19]->abbreviation());
+        self::assertSame('Weeks employed', $columns[20]->abbreviation());
+        self::assertSame('Weeks other', $columns[21]->abbreviation());
+        self::assertSame('Hrs worked', $columns[22]->abbreviation());
+        self::assertSame('Hrs at other', $columns[23]->abbreviation());
+        self::assertSame('Earned 1910 $', $columns[24]->abbreviation());
+        self::assertSame('Earned at other 1910 $', $columns[25]->abbreviation());
+        self::assertSame('Rate hr-cents', $columns[26]->abbreviation());
+        self::assertSame('Life Ins $', $columns[27]->abbreviation());
+        self::assertSame('Accident/sick Ins $', $columns[28]->abbreviation());
+        self::assertSame('Ins Cost $', $columns[29]->abbreviation());
+        self::assertSame('Ms school', $columns[30]->abbreviation());
+        self::assertSame('Read', $columns[31]->abbreviation());
+        self::assertSame('Write', $columns[32]->abbreviation());
+        self::assertSame('Language', $columns[33]->abbreviation());
+        self::assertSame('Edu cost', $columns[34]->abbreviation());
+
+        self::assertSame('Name of each person in family, household or institution', $columns[0]->title());
+        self::assertSame('Place of Habitation', $columns[1]->title());
+        self::assertSame('Sex', $columns[2]->title());
+        self::assertSame('Relationship to Head of Family or household', $columns[3]->title());
+        self::assertSame('Single, Married, Widowed, Divorced or Legally Separated', $columns[4]->title());
+        self::assertSame('Month of birth', $columns[5]->title());
+        self::assertSame('Year of birth', $columns[6]->title());
+        self::assertSame('Age at last birthday - on June 1, 1911', $columns[7]->title());
+        self::assertSame('Country or Place of Birth', $columns[8]->title());
+        self::assertSame('Year of immigration to Canada, if an immigrant', $columns[9]->title());
+        self::assertSame('Year of naturalization, if formerly an alien', $columns[10]->title());
+        self::assertSame('Racial or tribal origin', $columns[11]->title());
+        self::assertSame('Nationality', $columns[12]->title());
+        self::assertSame('Religion', $columns[13]->title());
+        self::assertSame('Chief occupation or trade', $columns[14]->title());
+        self::assertSame('Living on own means', $columns[15]->title());
+        self::assertSame('Employer', $columns[16]->title());
+        self::assertSame('Employee', $columns[17]->title());
+        self::assertSame('Working on own account', $columns[18]->title());
+        self::assertSame('State where person is employed, as "on Farm," "in Woolen Mill," "at Foundry Shop," "in Drug Store," etc.', $columns[19]->title());
+        self::assertSame('Weeks employed in 1910 at chief occupation or trade', $columns[20]->title());
+        self::assertSame('Weeks employed in 1910 at other than chief occupation or trade, if any', $columns[21]->title());
+        self::assertSame('Hours of working time per week at chief occupation', $columns[22]->title());
+        self::assertSame('Hours of working time per week at other occupation, if any', $columns[23]->title());
+        self::assertSame('Total earnings in 1910 from chief occupation or trade', $columns[24]->title());
+        self::assertSame('Total earnings in 1910 from other than chief occupation or trade, if any', $columns[25]->title());
+        self::assertSame('Rate of earnings per hour when employed by the hour-cents', $columns[26]->title());
+        self::assertSame('Upon life $, as of June 1, 1911', $columns[27]->title());
+        self::assertSame('Insurance $ Against accident or sickness, as of June 1, 1911', $columns[28]->title());
+        self::assertSame('Cost of insurance in census year $', $columns[29]->title());
+        self::assertSame('Months at school in 1910 for individuals aged 5-21 years', $columns[30]->title());
+        self::assertSame('Can read', $columns[31]->title());
+        self::assertSame('Can write', $columns[32]->title());
+        self::assertSame('Language commonly spoken, E and/or F', $columns[33]->title());
+        self::assertSame('Cost of education in 1910 for persons over 16 Years of age', $columns[34]->title());
+    }
+}
diff --git a/tests/app/Census/CensusOfCanada1921Test.php b/tests/app/Census/CensusOfCanada1921Test.php
new file mode 100644
index 0000000000..471e579e9a
--- /dev/null
+++ b/tests/app/Census/CensusOfCanada1921Test.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2021 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\TestCase;
+
+/**
+ * Test harness for the class CensusOfCanada1921
+ */
+class CensusOfCanada1921Test extends TestCase
+{
+    /**
+     * Test the census place and date
+     *
+     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1921
+     *
+     * @return void
+     */
+    public function testPlaceAndDate(): void
+    {
+        $census = new CensusOfCanada1921();
+
+        self::assertSame('Canada', $census->censusPlace());
+        self::assertSame('01 JUN 1921', $census->censusDate());
+    }
+
+    /**
+     * Test the census columns
+     *
+     * @covers \Fisharebest\Webtrees\Census\CensusOfCanada1921
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
+     *
+     * @return void
+     */
+    public function testColumns(): void
+    {
+        $census  = new CensusOfCanada1921();
+        $columns = $census->columns();
+
+        self::assertCount(32, $columns);
+        self::assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[1]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[2]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[3]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[4]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[5]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[6]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[7]);
+        self::assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[8]);
+        self::assertInstanceOf(CensusColumnSexMF::class, $columns[9]);
+        self::assertInstanceOf(CensusColumnConditionCan::class, $columns[10]);
+        self::assertInstanceOf(CensusColumnAge::class, $columns[11]);
+        self::assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[12]);
+        self::assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[13]);
+        self::assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[14]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[15]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[16]);
+        self::assertInstanceOf(CensusColumnNationality::class, $columns[17]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[18]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[19]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[20]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[21]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[22]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[23]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[24]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[25]);
+        self::assertInstanceOf(CensusColumnOccupation::class, $columns[26]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[27]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[28]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[29]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[30]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[31]);
+
+        self::assertSame('Name', $columns[0]->abbreviation());
+        self::assertSame('Sec/Twp', $columns[1]->abbreviation());
+        self::assertSame('Municipality', $columns[2]->abbreviation());
+        self::assertSame('Own/Rent', $columns[3]->abbreviation());
+        self::assertSame('Rent $', $columns[4]->abbreviation());
+        self::assertSame('Home Type', $columns[5]->abbreviation());
+        self::assertSame('Materials', $columns[6]->abbreviation());
+        self::assertSame('Rooms', $columns[7]->abbreviation());
+        self::assertSame('Relation', $columns[8]->abbreviation());
+        self::assertSame('Sex', $columns[9]->abbreviation());
+        self::assertSame('S/M/W/D/L', $columns[10]->abbreviation());
+        self::assertSame('Age', $columns[11]->abbreviation());
+        self::assertSame('Birth Loc', $columns[12]->abbreviation());
+        self::assertSame('FBP', $columns[13]->abbreviation());
+        self::assertSame('MBP', $columns[14]->abbreviation());
+        self::assertSame('Yr. immigrated', $columns[15]->abbreviation());
+        self::assertSame('Yr. naturalized', $columns[16]->abbreviation());
+        self::assertSame('Nationality', $columns[17]->abbreviation());
+        self::assertSame('Origin', $columns[18]->abbreviation());
+        self::assertSame('English', $columns[19]->abbreviation());
+        self::assertSame('French', $columns[20]->abbreviation());
+        self::assertSame('Language', $columns[21]->abbreviation());
+        self::assertSame('Religion', $columns[22]->abbreviation());
+        self::assertSame('Read', $columns[23]->abbreviation());
+        self::assertSame('Write', $columns[24]->abbreviation());
+        self::assertSame('Ms school', $columns[25]->abbreviation());
+        self::assertSame('Occupation', $columns[26]->abbreviation());
+        self::assertSame('E/W/OA', $columns[27]->abbreviation());
+        self::assertSame('Where employed', $columns[28]->abbreviation());
+        self::assertSame('Unemployed', $columns[29]->abbreviation());
+        self::assertSame('Earnings', $columns[30]->abbreviation());
+        self::assertSame('Weeks unemployed', $columns[31]->abbreviation());
+
+        self::assertSame('Name of each person in family, household or institution', $columns[0]->title());
+        self::assertSame('Place of Abode (Section or Township)', $columns[1]->title());
+        self::assertSame('Place of Abode (Municipality)', $columns[2]->title());
+        self::assertSame('Home owned or rented', $columns[3]->title());
+        self::assertSame('If rented, give rent paid per month', $columns[4]->title());
+        self::assertSame('Class of houses: Apartment, row or Terrace, Single house, semi-Detached', $columns[5]->title());
+        self::assertSame('Materials of Construction. Stone, Brick, Wood, Brick Veneered, Plastered with Lime morar, Plastered with Cement mortar, cement blocks or CONcrete', $columns[6]->title());
+        self::assertSame('Rooms occupied by this family', $columns[7]->title());
+        self::assertSame('Relationship to Head of Family or household', $columns[8]->title());
+        self::assertSame('Sex', $columns[9]->title());
+        self::assertSame('Single, Married, Widowed, Divorced or Legally Separated', $columns[10]->title());
+        self::assertSame('Age at last birthday - on June 1, 1921', $columns[11]->title());
+        self::assertSame('Place of birth of person', $columns[12]->title());
+        self::assertSame('Place of birth of father', $columns[13]->title());
+        self::assertSame('Place of birth of mother', $columns[14]->title());
+        self::assertSame('Year of immigration to Canada', $columns[15]->title());
+        self::assertSame('Year of naturalization', $columns[16]->title());
+        self::assertSame('Nationality', $columns[17]->title());
+        self::assertSame('Racial or tribal origin', $columns[18]->title());
+        self::assertSame('Can speak English', $columns[19]->title());
+        self::assertSame('Can speak French', $columns[20]->title());
+        self::assertSame('Language other than English or French spoken as mother tongue', $columns[21]->title());
+        self::assertSame('Religious body, Denomination or Community to which this person adheres or belongs
+The religion to which an individual claimed to belong written in full', $columns[22]->title());
+        self::assertSame('Can read', $columns[23]->title());
+        self::assertSame('Can write', $columns[24]->title());
+        self::assertSame('Months at school since Sept. 1, 1920', $columns[25]->title());
+        self::assertSame('Chief occupation or trade', $columns[26]->title());
+        self::assertSame('Employer or employee or Worker, working on Own Account', $columns[27]->title());
+        self::assertSame('"a" if "Employer" state principal product, "b" if "Employee" state where employed as "Farm", "Cotton Mill", "Foundry", "Grocery", etc. "c" if on "Own account" state nature of work', $columns[28]->title());
+        self::assertSame('If an employee, where you out of work June 1st , 1920', $columns[29]->title());
+        self::assertSame('Total earnings past 12 months since June 1, 1920', $columns[30]->title());
+        self::assertSame('Weeks unemployed in the past 12 months since June 1st, 1920', $columns[31]->title());
+    }
+}