diff options
Diffstat (limited to 'tests/app/Census')
57 files changed, 257 insertions, 118 deletions
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php index c7163481a7..96b7c42734 100644 --- a/tests/app/Census/CensusColumnConditionDanishTest.php +++ b/tests/app/Census/CensusColumnConditionDanishTest.php @@ -18,11 +18,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\Fact; +use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; use Mockery; /** - * Test harness for the class CensusColumnCondition + * Test harness for the class CensusColumnConditionDanish */ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase { /** @@ -33,16 +35,82 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase { } /** - * @covers Fisharebest\Webtrees\Census\CensusColumnCondition + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionDanish * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn */ - public function testNull() { + public function testNoSpouseFamilies() { $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([]); $census = Mockery::mock(CensusInterface::class); - $column = new CensusColumnConditionDnish($census, '', ''); + $column = new CensusColumnConditionDanish($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('Ugift', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionDanish + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testNoFamilyNoFacts() { + $family = Mockery::mock(Family::class); + $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); + $family->shouldReceive('getFacts')->andReturn([]); + + $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + + $census = Mockery::mock(CensusInterface::class); + + $column = new CensusColumnConditionDanish($census, '', ''); + $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); + + $this->assertSame('Gift', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionDanish + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testNoFamilyUnmarried() { + $fact = Mockery::mock(Fact::class); + + $family = Mockery::mock(Family::class); + $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); + $family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]); + + $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + + $census = Mockery::mock(CensusInterface::class); + + $column = new CensusColumnConditionDanish($census, '', ''); + $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); + + $this->assertSame('Ugift', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionDanish + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testNoFamilyDivorced() { + $fact = Mockery::mock(Fact::class); + + $family = Mockery::mock(Family::class); + $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); + $family->shouldReceive('getFacts')->with('_NMR')->andReturn([]); + $family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]); + + $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + + $census = Mockery::mock(CensusInterface::class); + + $column = new CensusColumnConditionDanish($census, '', ''); + $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); + + $this->assertSame('Skilt', $column->generate($individual)); } } diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php new file mode 100644 index 0000000000..1787d0b7cd --- /dev/null +++ b/tests/app/Census/CensusColumnConditionEnglishTest.php @@ -0,0 +1,116 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2015 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 <http://www.gnu.org/licenses/>. + */ + +namespace Fisharebest\Webtrees\Census; + +use Fisharebest\Webtrees\Date; +use Fisharebest\Webtrees\Fact; +use Fisharebest\Webtrees\Family; +use Fisharebest\Webtrees\Individual; +use Mockery; + +/** + * Test harness for the class CensusColumnConditionEnglish + */ +class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase { + /** + * Delete mock objects + */ + public function tearDown() { + Mockery::close(); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testNoSpouseFamilies() { + $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + + $census = Mockery::mock(CensusInterface::class); + + $column = new CensusColumnConditionEnglish($census, '', ''); + + $this->assertSame('Unm', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testNoFamilyNoFacts() { + $family = Mockery::mock(Family::class); + $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); + $family->shouldReceive('getFacts')->andReturn([]); + + $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + + $census = Mockery::mock(CensusInterface::class); + + $column = new CensusColumnConditionEnglish($census, '', ''); + $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); + + $this->assertSame('Mar', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testNoFamilyUnmarried() { + $fact = Mockery::mock(Fact::class); + + $family = Mockery::mock(Family::class); + $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); + $family->shouldReceive('getFacts')->with('_NMR')->andReturn([$fact]); + + $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + + $census = Mockery::mock(CensusInterface::class); + + $column = new CensusColumnConditionEnglish($census, '', ''); + $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); + + $this->assertSame('Unm', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testNoFamilyDivorced() { + $fact = Mockery::mock(Fact::class); + + $family = Mockery::mock(Family::class); + $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); + $family->shouldReceive('getFacts')->with('_NMR')->andReturn([]); + $family->shouldReceive('getFacts')->with('DIV')->andReturn([$fact]); + + $individual = Mockery::mock(Individual::class); + $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + + $census = Mockery::mock(CensusInterface::class); + + $column = new CensusColumnConditionEnglish($census, '', ''); + $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); + + $this->assertSame('Div', $column->generate($individual)); + } +} diff --git a/tests/app/Census/CensusColumnConditionTest.php b/tests/app/Census/CensusColumnConditionTest.php deleted file mode 100644 index 9ff369eff4..0000000000 --- a/tests/app/Census/CensusColumnConditionTest.php +++ /dev/null @@ -1,48 +0,0 @@ -<?php - -/** - * webtrees: online genealogy - * Copyright (C) 2015 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 <http://www.gnu.org/licenses/>. - */ - -namespace Fisharebest\Webtrees\Census; - -use Fisharebest\Webtrees\Date; -use Fisharebest\Webtrees\Individual; -use Mockery; - -/** - * Test harness for the class CensusColumnCondition - */ -class CensusColumnConditionTest extends \PHPUnit_Framework_TestCase { - /** - * Delete mock objects - */ - public function tearDown() { - Mockery::close(); - } - - /** - * @covers Fisharebest\Webtrees\Census\CensusColumnCondition - * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn - */ - public function testNull() { - $individual = Mockery::mock(Individual::class); - - $census = Mockery::mock(CensusInterface::class); - - $column = new CensusColumnCondition($census, '', ''); - - $this->assertSame('', $column->generate($individual)); - } -} diff --git a/tests/app/Census/CensusColumnDateOfBirthTest.php b/tests/app/Census/CensusColumnDateOfBirthTest.php index dfc75a0e78..172db3490c 100644 --- a/tests/app/Census/CensusColumnDateOfBirthTest.php +++ b/tests/app/Census/CensusColumnDateOfBirthTest.php @@ -33,18 +33,21 @@ class CensusColumnDateOfBirthTest extends \PHPUnit_Framework_TestCase { } /** - * @covers Fisharebest\Webtrees\Census\CensusColumnAge + * @covers Fisharebest\Webtrees\Census\CensusColumnDateOfBirth * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn */ public function testGenerateColumn() { + $date = Mockery::mock(Date::class); + $date->shouldReceive('display')->andReturn('1 January 1800'); + $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); + $individual->shouldReceive('getEstimatedBirthDate')->andReturn($date); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('30 JUN 1832'); $column = new CensusColumnDateOfBirth($census, '', ''); - $this->assertSame('32', $column->generate($individual)); + $this->assertSame('1 January 1800', $column->generate($individual)); } } diff --git a/tests/app/Census/CensusOfDenmark1801Test.php b/tests/app/Census/CensusOfDenmark1801Test.php index d6ab0d1ced..92d0affa2c 100644 --- a/tests/app/Census/CensusOfDenmark1801Test.php +++ b/tests/app/Census/CensusOfDenmark1801Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1801Test extends \PHPUnit_Framework_TestCase { $this->assertCount(5, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); diff --git a/tests/app/Census/CensusOfDenmark1803Test.php b/tests/app/Census/CensusOfDenmark1803Test.php index 1192f46422..834258102b 100644 --- a/tests/app/Census/CensusOfDenmark1803Test.php +++ b/tests/app/Census/CensusOfDenmark1803Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1803Test extends \PHPUnit_Framework_TestCase { $this->assertCount(5, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); diff --git a/tests/app/Census/CensusOfDenmark1834Test.php b/tests/app/Census/CensusOfDenmark1834Test.php index aeb59bbc76..c405420c26 100644 --- a/tests/app/Census/CensusOfDenmark1834Test.php +++ b/tests/app/Census/CensusOfDenmark1834Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1834Test extends \PHPUnit_Framework_TestCase { $this->assertCount(5, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); diff --git a/tests/app/Census/CensusOfDenmark1835Test.php b/tests/app/Census/CensusOfDenmark1835Test.php index b542a5c6b0..b2a8d57977 100644 --- a/tests/app/Census/CensusOfDenmark1835Test.php +++ b/tests/app/Census/CensusOfDenmark1835Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1835Test extends \PHPUnit_Framework_TestCase { $this->assertCount(5, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); diff --git a/tests/app/Census/CensusOfDenmark1840Test.php b/tests/app/Census/CensusOfDenmark1840Test.php index 3896ac7d66..8a48e320f4 100644 --- a/tests/app/Census/CensusOfDenmark1840Test.php +++ b/tests/app/Census/CensusOfDenmark1840Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1840Test extends \PHPUnit_Framework_TestCase { $this->assertCount(5, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); diff --git a/tests/app/Census/CensusOfDenmark1845Test.php b/tests/app/Census/CensusOfDenmark1845Test.php index 69f03efc5f..fb4dccef37 100644 --- a/tests/app/Census/CensusOfDenmark1845Test.php +++ b/tests/app/Census/CensusOfDenmark1845Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1845Test extends \PHPUnit_Framework_TestCase { $this->assertCount(7, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); diff --git a/tests/app/Census/CensusOfDenmark1850Test.php b/tests/app/Census/CensusOfDenmark1850Test.php index 19c49cf873..8d01fabf97 100644 --- a/tests/app/Census/CensusOfDenmark1850Test.php +++ b/tests/app/Census/CensusOfDenmark1850Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1850Test extends \PHPUnit_Framework_TestCase { $this->assertCount(7, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); diff --git a/tests/app/Census/CensusOfDenmark1855Test.php b/tests/app/Census/CensusOfDenmark1855Test.php index 1cb5edd1c0..b43683342d 100644 --- a/tests/app/Census/CensusOfDenmark1855Test.php +++ b/tests/app/Census/CensusOfDenmark1855Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1855Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); diff --git a/tests/app/Census/CensusOfDenmark1860Test.php b/tests/app/Census/CensusOfDenmark1860Test.php index 9c77d116a6..4e05965607 100644 --- a/tests/app/Census/CensusOfDenmark1860Test.php +++ b/tests/app/Census/CensusOfDenmark1860Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1860Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); diff --git a/tests/app/Census/CensusOfDenmark1870Test.php b/tests/app/Census/CensusOfDenmark1870Test.php index 37c2c30a8b..3350c61103 100644 --- a/tests/app/Census/CensusOfDenmark1870Test.php +++ b/tests/app/Census/CensusOfDenmark1870Test.php @@ -46,7 +46,7 @@ class CensusOfDenmark1870Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); diff --git a/tests/app/Census/CensusOfDenmark1880Test.php b/tests/app/Census/CensusOfDenmark1880Test.php index 6c7883edf7..417c0fea4c 100644 --- a/tests/app/Census/CensusOfDenmark1880Test.php +++ b/tests/app/Census/CensusOfDenmark1880Test.php @@ -47,7 +47,7 @@ class CensusOfDenmark1880Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1885Test.php b/tests/app/Census/CensusOfDenmark1885Test.php index a19e99e34e..f065b02b90 100644 --- a/tests/app/Census/CensusOfDenmark1885Test.php +++ b/tests/app/Census/CensusOfDenmark1885Test.php @@ -47,7 +47,7 @@ class CensusOfDenmark1885Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1890Test.php b/tests/app/Census/CensusOfDenmark1890Test.php index 30c7ad36a1..46f999541f 100644 --- a/tests/app/Census/CensusOfDenmark1890Test.php +++ b/tests/app/Census/CensusOfDenmark1890Test.php @@ -47,7 +47,7 @@ class CensusOfDenmark1890Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1895Test.php b/tests/app/Census/CensusOfDenmark1895Test.php index 06be25d9af..f106af7db2 100644 --- a/tests/app/Census/CensusOfDenmark1895Test.php +++ b/tests/app/Census/CensusOfDenmark1895Test.php @@ -47,7 +47,7 @@ class CensusOfDenmark1895Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1901Test.php b/tests/app/Census/CensusOfDenmark1901Test.php index 37adc2a4ba..ed66233eb4 100644 --- a/tests/app/Census/CensusOfDenmark1901Test.php +++ b/tests/app/Census/CensusOfDenmark1901Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1901Test extends \PHPUnit_Framework_TestCase { $this->assertCount(10, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1906Test.php b/tests/app/Census/CensusOfDenmark1906Test.php index 0de821bcfa..9034de2d99 100644 --- a/tests/app/Census/CensusOfDenmark1906Test.php +++ b/tests/app/Census/CensusOfDenmark1906Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1906Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1911Test.php b/tests/app/Census/CensusOfDenmark1911Test.php index 9d946f9b89..c1b1329f59 100644 --- a/tests/app/Census/CensusOfDenmark1911Test.php +++ b/tests/app/Census/CensusOfDenmark1911Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1911Test extends \PHPUnit_Framework_TestCase { $this->assertCount(10, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1916Test.php b/tests/app/Census/CensusOfDenmark1916Test.php index 366d64dfef..50f35a2ec3 100644 --- a/tests/app/Census/CensusOfDenmark1916Test.php +++ b/tests/app/Census/CensusOfDenmark1916Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1916Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1921Test.php b/tests/app/Census/CensusOfDenmark1921Test.php index 67cfef7edc..de74a5488c 100644 --- a/tests/app/Census/CensusOfDenmark1921Test.php +++ b/tests/app/Census/CensusOfDenmark1921Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1921Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1925Test.php b/tests/app/Census/CensusOfDenmark1925Test.php index b8acb8b4c4..cd69bed4a7 100644 --- a/tests/app/Census/CensusOfDenmark1925Test.php +++ b/tests/app/Census/CensusOfDenmark1925Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1925Test extends \PHPUnit_Framework_TestCase { $this->assertCount(9, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1930Test.php b/tests/app/Census/CensusOfDenmark1930Test.php index d8b428ce42..3ccbf22778 100644 --- a/tests/app/Census/CensusOfDenmark1930Test.php +++ b/tests/app/Census/CensusOfDenmark1930Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1930Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1940Test.php b/tests/app/Census/CensusOfDenmark1940Test.php index f57c080d21..7c34bd76e9 100644 --- a/tests/app/Census/CensusOfDenmark1940Test.php +++ b/tests/app/Census/CensusOfDenmark1940Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1940Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfDenmark1950Test.php b/tests/app/Census/CensusOfDenmark1950Test.php index b1a2f516ed..0be8047021 100644 --- a/tests/app/Census/CensusOfDenmark1950Test.php +++ b/tests/app/Census/CensusOfDenmark1950Test.php @@ -45,9 +45,9 @@ class CensusOfDenmark1950Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnDateOfBirth::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfEngland1851Test.php b/tests/app/Census/CensusOfEngland1851Test.php index 904382a818..a592e8a151 100644 --- a/tests/app/Census/CensusOfEngland1851Test.php +++ b/tests/app/Census/CensusOfEngland1851Test.php @@ -46,7 +46,7 @@ class CensusOfEngland1851Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfEngland1861Test.php b/tests/app/Census/CensusOfEngland1861Test.php index 79c7d03776..5b5e280adc 100644 --- a/tests/app/Census/CensusOfEngland1861Test.php +++ b/tests/app/Census/CensusOfEngland1861Test.php @@ -46,7 +46,7 @@ class CensusOfEngland1861Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php index c63127ae27..57f319f7a5 100644 --- a/tests/app/Census/CensusOfEngland1871Test.php +++ b/tests/app/Census/CensusOfEngland1871Test.php @@ -46,7 +46,7 @@ class CensusOfEngland1871Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php index 8d77d539e4..53afc799e9 100644 --- a/tests/app/Census/CensusOfEngland1881Test.php +++ b/tests/app/Census/CensusOfEngland1881Test.php @@ -46,7 +46,7 @@ class CensusOfEngland1881Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php index 294e3d62e4..374fb64b9b 100644 --- a/tests/app/Census/CensusOfEngland1891Test.php +++ b/tests/app/Census/CensusOfEngland1891Test.php @@ -46,7 +46,7 @@ class CensusOfEngland1891Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php index cfc10d4609..f66f0ff3fd 100644 --- a/tests/app/Census/CensusOfEngland1901Test.php +++ b/tests/app/Census/CensusOfEngland1901Test.php @@ -46,7 +46,7 @@ class CensusOfEngland1901Test extends \PHPUnit_Framework_TestCase { $this->assertCount(10, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php index 8d2c2c0a70..130150355e 100644 --- a/tests/app/Census/CensusOfEngland1911Test.php +++ b/tests/app/Census/CensusOfEngland1911Test.php @@ -48,7 +48,7 @@ class CensusOfEngland1911Test extends \PHPUnit_Framework_TestCase { $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(CensusColumnConditionEnglish::class, $columns[4]); $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[5]); $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[6]); $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[7]); diff --git a/tests/app/Census/CensusOfFrance1836Test.php b/tests/app/Census/CensusOfFrance1836Test.php index 6a4837cb4a..764ef452d0 100644 --- a/tests/app/Census/CensusOfFrance1836Test.php +++ b/tests/app/Census/CensusOfFrance1836Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1836Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertSame('XXXX', $columns[0]->abbreviation()); $this->assertSame('XXXX', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1841Test.php b/tests/app/Census/CensusOfFrance1841Test.php index 038a6ab16e..d7b545448a 100644 --- a/tests/app/Census/CensusOfFrance1841Test.php +++ b/tests/app/Census/CensusOfFrance1841Test.php @@ -47,7 +47,7 @@ class CensusOfFrance1841Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]); $this->assertSame('XXXX', $columns[0]->abbreviation()); $this->assertSame('XXXX', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1846Test.php b/tests/app/Census/CensusOfFrance1846Test.php index 162fabd54e..c5d348589b 100644 --- a/tests/app/Census/CensusOfFrance1846Test.php +++ b/tests/app/Census/CensusOfFrance1846Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1846Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertSame('XXXX', $columns[0]->abbreviation()); $this->assertSame('XXXX', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1851Test.php b/tests/app/Census/CensusOfFrance1851Test.php index 8ca0424ff1..2dfb7ed3af 100644 --- a/tests/app/Census/CensusOfFrance1851Test.php +++ b/tests/app/Census/CensusOfFrance1851Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1851Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertInstanceOf(CensusColumnNationality::class, $columns[5]); $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); diff --git a/tests/app/Census/CensusOfFrance1856Test.php b/tests/app/Census/CensusOfFrance1856Test.php index 171e449615..621daf9d16 100644 --- a/tests/app/Census/CensusOfFrance1856Test.php +++ b/tests/app/Census/CensusOfFrance1856Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1856Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertSame('XXXX', $columns[0]->abbreviation()); $this->assertSame('XXXX', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1861Test.php b/tests/app/Census/CensusOfFrance1861Test.php index 043193b683..e84fbfd06c 100644 --- a/tests/app/Census/CensusOfFrance1861Test.php +++ b/tests/app/Census/CensusOfFrance1861Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1861Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertSame('XXXX', $columns[0]->abbreviation()); $this->assertSame('XXXX', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1866Test.php b/tests/app/Census/CensusOfFrance1866Test.php index 87b6d198c2..c03a89b544 100644 --- a/tests/app/Census/CensusOfFrance1866Test.php +++ b/tests/app/Census/CensusOfFrance1866Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1866Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertSame('XXXX', $columns[0]->abbreviation()); $this->assertSame('XXXX', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1872Test.php b/tests/app/Census/CensusOfFrance1872Test.php index 92abff42e9..8fac95ae71 100644 --- a/tests/app/Census/CensusOfFrance1872Test.php +++ b/tests/app/Census/CensusOfFrance1872Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1872Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertInstanceOf(CensusColumnNationality::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfFrance1876Test.php b/tests/app/Census/CensusOfFrance1876Test.php index 91bc6b33ea..07a3d2dd50 100644 --- a/tests/app/Census/CensusOfFrance1876Test.php +++ b/tests/app/Census/CensusOfFrance1876Test.php @@ -48,7 +48,7 @@ class CensusOfFrance1876Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); $this->assertInstanceOf(CensusColumnAge::class, $columns[3]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); $this->assertInstanceOf(CensusColumnNationality::class, $columns[5]); $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); diff --git a/tests/app/Census/CensusOfScotland1851Test.php b/tests/app/Census/CensusOfScotland1851Test.php index 3be284c048..564671ade5 100644 --- a/tests/app/Census/CensusOfScotland1851Test.php +++ b/tests/app/Census/CensusOfScotland1851Test.php @@ -46,7 +46,7 @@ class CensusOfScotland1851Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php index a1506ab8fb..6e72a4f4b4 100644 --- a/tests/app/Census/CensusOfScotland1861Test.php +++ b/tests/app/Census/CensusOfScotland1861Test.php @@ -46,7 +46,7 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase { $this->assertCount(9, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php index 4e51013266..bd6a551707 100644 --- a/tests/app/Census/CensusOfScotland1871Test.php +++ b/tests/app/Census/CensusOfScotland1871Test.php @@ -46,7 +46,7 @@ class CensusOfScotland1871Test extends \PHPUnit_Framework_TestCase { $this->assertCount(9, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php index ee65aa6ae7..72044fe13b 100644 --- a/tests/app/Census/CensusOfScotland1881Test.php +++ b/tests/app/Census/CensusOfScotland1881Test.php @@ -46,7 +46,7 @@ class CensusOfScotland1881Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php index fb43016ffd..47c2a026e4 100644 --- a/tests/app/Census/CensusOfScotland1891Test.php +++ b/tests/app/Census/CensusOfScotland1891Test.php @@ -46,7 +46,7 @@ class CensusOfScotland1891Test extends \PHPUnit_Framework_TestCase { $this->assertCount(12, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php index 76997475e2..f46378861c 100644 --- a/tests/app/Census/CensusOfScotland1901Test.php +++ b/tests/app/Census/CensusOfScotland1901Test.php @@ -46,7 +46,7 @@ class CensusOfScotland1901Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php index 983a0cab64..0060d23873 100644 --- a/tests/app/Census/CensusOfScotland1911Test.php +++ b/tests/app/Census/CensusOfScotland1911Test.php @@ -49,7 +49,7 @@ class CensusOfScotland1911Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]); $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[5]); $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[6]); $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[7]); $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[8]); diff --git a/tests/app/Census/CensusOfWales1851Test.php b/tests/app/Census/CensusOfWales1851Test.php index 97aec3b314..accfbd26fb 100644 --- a/tests/app/Census/CensusOfWales1851Test.php +++ b/tests/app/Census/CensusOfWales1851Test.php @@ -46,7 +46,7 @@ class CensusOfWales1851Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfWales1861Test.php b/tests/app/Census/CensusOfWales1861Test.php index e428d23969..65a144b23e 100644 --- a/tests/app/Census/CensusOfWales1861Test.php +++ b/tests/app/Census/CensusOfWales1861Test.php @@ -46,7 +46,7 @@ class CensusOfWales1861Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php index e517b2f360..cbf30292b6 100644 --- a/tests/app/Census/CensusOfWales1871Test.php +++ b/tests/app/Census/CensusOfWales1871Test.php @@ -46,7 +46,7 @@ class CensusOfWales1871Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php index bacf1ed2bd..8a00e67792 100644 --- a/tests/app/Census/CensusOfWales1881Test.php +++ b/tests/app/Census/CensusOfWales1881Test.php @@ -46,7 +46,7 @@ class CensusOfWales1881Test extends \PHPUnit_Framework_TestCase { $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php index 94f238949f..5f744bd011 100644 --- a/tests/app/Census/CensusOfWales1891Test.php +++ b/tests/app/Census/CensusOfWales1891Test.php @@ -46,7 +46,7 @@ class CensusOfWales1891Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php index c69479adb2..a5b168c1df 100644 --- a/tests/app/Census/CensusOfWales1901Test.php +++ b/tests/app/Census/CensusOfWales1901Test.php @@ -46,7 +46,7 @@ class CensusOfWales1901Test extends \PHPUnit_Framework_TestCase { $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php index 89bd614213..b08e5ea99c 100644 --- a/tests/app/Census/CensusOfWales1911Test.php +++ b/tests/app/Census/CensusOfWales1911Test.php @@ -48,7 +48,7 @@ class CensusOfWales1911Test extends \PHPUnit_Framework_TestCase { $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(CensusColumnConditionEnglish::class, $columns[4]); $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[5]); $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[6]); $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[7]); |