diff options
| -rw-r--r-- | app/Census/CensusColumnBornForeignParts.php | 2 | ||||
| -rw-r--r-- | tests/app/Census/CensusColumnBornForeignPartsTest.php | 48 |
2 files changed, 49 insertions, 1 deletions
diff --git a/app/Census/CensusColumnBornForeignParts.php b/app/Census/CensusColumnBornForeignParts.php index d06d79e363..653993be04 100644 --- a/app/Census/CensusColumnBornForeignParts.php +++ b/app/Census/CensusColumnBornForeignParts.php @@ -42,7 +42,7 @@ class CensusColumnBornForeignParts extends AbstractCensusColumn implements Censu $census_place = 'England'; } - if ($birth_place === $census_place) { + if ($birth_place === $census_place || $birth_place === '') { return ''; } elseif ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') { return substr($birth_place, 0, 1); diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php index 0f99b70bf1..63693a25f7 100644 --- a/tests/app/Census/CensusColumnBornForeignPartsTest.php +++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php @@ -349,4 +349,52 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase { $this->assertSame('F', $column->generate($individual)); } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testBornNowhereCensusEngland() { + $individual = Mockery::mock('Fisharebest\Webtrees\Individual'); + $individual->shouldReceive('getBirthPlace')->andReturn(''); + + $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface'); + $census->shouldReceive('censusPlace')->andReturn('England'); + + $column = new CensusColumnBornForeignParts($census, '', ''); + + $this->assertSame('', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testBornNowhereCensusWales() { + $individual = Mockery::mock('Fisharebest\Webtrees\Individual'); + $individual->shouldReceive('getBirthPlace')->andReturn(''); + + $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface'); + $census->shouldReceive('censusPlace')->andReturn('Wales'); + + $column = new CensusColumnBornForeignParts($census, '', ''); + + $this->assertSame('', $column->generate($individual)); + } + + /** + * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts + * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn + */ + public function testBornNowhereCensusScotland() { + $individual = Mockery::mock('Fisharebest\Webtrees\Individual'); + $individual->shouldReceive('getBirthPlace')->andReturn(''); + + $census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface'); + $census->shouldReceive('censusPlace')->andReturn('Scotland'); + + $column = new CensusColumnBornForeignParts($census, '', ''); + + $this->assertSame('', $column->generate($individual)); + } } |