Fix #854 French censuses

1 files changed, 150 insertions, 8 deletions

diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 19593778ef..e86770ea3c 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -35,13 +35,34 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
 	 */
-	public function testNoSpouseFamilies() {
+	public function testNoSpouseFamiliesMale() {
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$column = new CensusColumnConditionEnglish($census, '', '');
+
+		$this->assertSame('Unm', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+	 */
+	public function testNoSpouseFamiliesFemale() {
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
+
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
 		$column = new CensusColumnConditionEnglish($census, '', '');
 
@@ -50,14 +71,36 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+	 */
+	public function testNoFamilyNoFactsMale() {
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
+		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
+		$family->shouldReceive('getFacts')->andReturn(array());
+
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+
+		$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\AbstractCensusColumnCondition
 	 */
-	public function testNoFamilyNoFacts() {
+	public function testNoFamilyNoFactsFemale() {
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
 		$family->shouldReceive('getFacts')->andReturn(array());
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
@@ -70,9 +113,9 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
 	 */
-	public function testNoFamilyUnmarried() {
+	public function testNoFamilyUnmarriedMale() {
 		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
@@ -80,21 +123,119 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
 		$column = new CensusColumnConditionEnglish($census, '', '');
+
+		$this->assertSame('Unm', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+	 */
+	public function testNoFamilyUnmarriedFemale() {
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
+		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800'));
+
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
+		$column = new CensusColumnConditionEnglish($census, '', '');
+
 		$this->assertSame('Unm', $column->generate($individual));
 	}
 
 	/**
 	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
-	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+	 */
+	public function testChildMale() {
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
+		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
+
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$column = new CensusColumnConditionEnglish($census, '', '');
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+	 */
+	public function testChildFemale() {
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
+		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
+
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820'));
+
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$column = new CensusColumnConditionEnglish($census, '', '');
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+	 */
+	public function testDivorcedMale() {
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
+
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
+		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
+		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
+		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
+
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
+
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
+
+		$column = new CensusColumnConditionEnglish($census, '', '');
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$this->assertSame('Div', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnConditionEnglish
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
 	 */
-	public function testNoFamilyDivorced() {
+	public function testDivorcedFemale() {
 		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 
 		$family = Mockery::mock('Fisharebest\Webtrees\Family');
@@ -103,6 +244,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
 
 		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
+		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
 		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');