diff options
Diffstat (limited to 'tests/app/Census/CensusOfFrance1851Test.php')
| -rw-r--r-- | tests/app/Census/CensusOfFrance1851Test.php | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/tests/app/Census/CensusOfFrance1851Test.php b/tests/app/Census/CensusOfFrance1851Test.php index a5d0cb810c..806a08d05e 100644 --- a/tests/app/Census/CensusOfFrance1851Test.php +++ b/tests/app/Census/CensusOfFrance1851Test.php @@ -42,32 +42,46 @@ class CensusOfFrance1851Test extends \PHPUnit_Framework_TestCase { $census = new CensusOfFrance1851; $columns = $census->columns(); - $this->assertCount(8, $columns); + $this->assertCount(13, $columns); $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]); $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]); $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]); - $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]); - $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionFrench', $columns[4]); - $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[5]); - $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]); - $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon', $columns[3]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme', $columns[4]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf', $columns[5]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille', $columns[6]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme', $columns[7]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve', $columns[8]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[9]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]); + $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]); - $this->assertSame('Nom', $columns[0]->abbreviation()); - $this->assertSame('Prénom', $columns[1]->abbreviation()); - $this->assertSame('Profession', $columns[2]->abbreviation()); - $this->assertSame('Âge', $columns[3]->abbreviation()); - $this->assertSame('Situtation pers.', $columns[4]->abbreviation()); - $this->assertSame('Nationalité', $columns[5]->abbreviation()); - $this->assertSame('Religion', $columns[6]->abbreviation()); - $this->assertSame('Maladies', $columns[7]->abbreviation()); + $this->assertSame('Noms', $columns[0]->abbreviation()); + $this->assertSame('Prénoms', $columns[1]->abbreviation()); + $this->assertSame('Professions', $columns[2]->abbreviation()); + $this->assertSame('Garçons', $columns[3]->abbreviation()); + $this->assertSame('Hommes', $columns[4]->abbreviation()); + $this->assertSame('Veufs', $columns[5]->abbreviation()); + $this->assertSame('Filles', $columns[6]->abbreviation()); + $this->assertSame('Femmes', $columns[7]->abbreviation()); + $this->assertSame('Veuves', $columns[8]->abbreviation()); + $this->assertSame('Âge', $columns[9]->abbreviation()); + $this->assertSame('Fr', $columns[10]->abbreviation()); + $this->assertSame('Nat', $columns[11]->abbreviation()); + $this->assertSame('Etr', $columns[12]->abbreviation()); - $this->assertSame('Nom de famille', $columns[0]->title()); - $this->assertSame('Prénom', $columns[1]->title()); - $this->assertSame('Profession', $columns[2]->title()); - $this->assertSame('Âge', $columns[3]->title()); - $this->assertSame('Situation personnelle (marié, veuf…)', $columns[4]->title()); - $this->assertSame('Nationalité', $columns[5]->title()); - $this->assertSame('Religion', $columns[6]->title()); - $this->assertSame('Infirmités et maladies', $columns[7]->title()); + $this->assertSame('Noms de famille', $columns[0]->title()); + $this->assertSame('', $columns[1]->title()); + $this->assertSame('', $columns[2]->title()); + $this->assertSame('', $columns[3]->title()); + $this->assertSame('Hommes mariés', $columns[4]->title()); + $this->assertSame('', $columns[5]->title()); + $this->assertSame('', $columns[6]->title()); + $this->assertSame('Femmes mariées', $columns[7]->title()); + $this->assertSame('', $columns[8]->title()); + $this->assertSame('Français d’origine', $columns[10]->title()); + $this->assertSame('Naturalisés français', $columns[11]->title()); + $this->assertSame('Étrangers (indiquer leur pays d’origine)', $columns[12]->title()); } } |