diff options
Diffstat (limited to 'tests/app/Census')
36 files changed, 502 insertions, 479 deletions
diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php index ee558e5c59..3d39ef36b9 100644 --- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php @@ -45,7 +45,7 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -63,7 +63,7 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -83,7 +83,7 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testUnknownSex(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('U'); + $individual->shouldReceive('sex')->andReturn('U'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -103,7 +103,7 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testLessThanOneYear(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -123,7 +123,7 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testLessThanFifteenYears(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -143,7 +143,7 @@ class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testRoundedDownToFiveYears(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php index bb545650a5..946ead0770 100644 --- a/tests/app/Census/CensusColumnAgeFemaleTest.php +++ b/tests/app/Census/CensusColumnAgeFemaleTest.php @@ -45,7 +45,7 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -63,7 +63,7 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase public function testFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -83,7 +83,7 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase public function testUnknownSex(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('U'); + $individual->shouldReceive('sex')->andReturn('U'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -103,7 +103,7 @@ class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase public function testLessThanOneYear(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php index e0f7a22c9b..d1444bc07b 100644 --- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php @@ -45,7 +45,7 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -65,7 +65,7 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -83,7 +83,7 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testUnknownSex(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('U'); + $individual->shouldReceive('sex')->andReturn('U'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -103,7 +103,7 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testLessThanOneYear(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -123,7 +123,7 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testLessThanFifteenYears(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -143,7 +143,7 @@ class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase public function testRoundedDownToFiveYears(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php index 61ddcc2932..01170b9d4e 100644 --- a/tests/app/Census/CensusColumnAgeMaleTest.php +++ b/tests/app/Census/CensusColumnAgeMaleTest.php @@ -45,7 +45,7 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -65,7 +65,7 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase public function testFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -83,7 +83,7 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase public function testUnknownSex(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('U'); + $individual->shouldReceive('sex')->andReturn('U'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); @@ -103,7 +103,7 @@ class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase public function testLessThanOneYear(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800')); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php index 090757334f..364fc860c8 100644 --- a/tests/app/Census/CensusColumnAgeMarriedTest.php +++ b/tests/app/Census/CensusColumnAgeMarriedTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -50,11 +51,11 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'], true)->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthDate')->andReturn(new Date('15 MAR 1840')); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -74,7 +75,7 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase { $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthDate')->andReturn(new Date('')); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -93,11 +94,11 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase public function testNoMarriage(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthDate')->andReturn(new Date('')); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -117,7 +118,7 @@ class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase { $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthDate')->andReturn(new Date('15 MAR 1840')); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php index 75dc51e5ed..a55165f557 100644 --- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php +++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php @@ -20,6 +20,7 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -46,7 +47,7 @@ class CensusColumnChildrenBornAliveTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -84,7 +85,7 @@ class CensusColumnChildrenBornAliveTest extends \Fisharebest\Webtrees\TestCase $child4->shouldReceive('getDeathDate')->andReturn(new Date('')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getChildren')->andReturn([ + $family->shouldReceive('children')->andReturn([ $child1, $child2, $child3, @@ -92,8 +93,8 @@ class CensusColumnChildrenBornAliveTest extends \Fisharebest\Webtrees\TestCase ]); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('30 MAR 1911'); diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php index 0bed0fd62a..6e260596ac 100644 --- a/tests/app/Census/CensusColumnChildrenDiedTest.php +++ b/tests/app/Census/CensusColumnChildrenDiedTest.php @@ -19,6 +19,7 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -45,7 +46,7 @@ class CensusColumnChildrenDiedTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -83,7 +84,7 @@ class CensusColumnChildrenDiedTest extends \Fisharebest\Webtrees\TestCase $child4->shouldReceive('getDeathDate')->andReturn(new Date('')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getChildren')->andReturn([ + $family->shouldReceive('children')->andReturn([ $child1, $child2, $child3, @@ -91,8 +92,8 @@ class CensusColumnChildrenDiedTest extends \Fisharebest\Webtrees\TestCase ]); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('30 MAR 1911'); diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php index 1dafb8b7a0..1aab8859dc 100644 --- a/tests/app/Census/CensusColumnChildrenLivingTest.php +++ b/tests/app/Census/CensusColumnChildrenLivingTest.php @@ -20,6 +20,7 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -46,7 +47,7 @@ class CensusColumnChildrenLivingTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -84,7 +85,7 @@ class CensusColumnChildrenLivingTest extends \Fisharebest\Webtrees\TestCase $child4->shouldReceive('getDeathDate')->andReturn(new Date('')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getChildren')->andReturn([ + $family->shouldReceive('children')->andReturn([ $child1, $child2, $child3, @@ -92,8 +93,8 @@ class CensusColumnChildrenLivingTest extends \Fisharebest\Webtrees\TestCase ]); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('30 MAR 1911'); diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php index b19f9b8616..f9a94eb599 100644 --- a/tests/app/Census/CensusColumnConditionDanishTest.php +++ b/tests/app/Census/CensusColumnConditionDanishTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php index e121fe7ab3..327d267784 100644 --- a/tests/app/Census/CensusColumnConditionEnglishTest.php +++ b/tests/app/Census/CensusColumnConditionEnglishTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php index 9f41551417..42cddf117f 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php index 8c98cfedf1..49cf4eb09d 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php index 3ec5a20b79..8d2684bfca 100644 --- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCa $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php index efec105961..b6fcba96ba 100644 --- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php index d64eae336e..a2871b5ab9 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php index ac958e7ecc..cbfff41bcb 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCas $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php index 786b753b2b..a0c2a1ef65 100644 --- a/tests/app/Census/CensusColumnConditionUsTest.php +++ b/tests/app/Census/CensusColumnConditionUsTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,8 +48,8 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -68,8 +69,8 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamiliesFemale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -90,12 +91,12 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -115,12 +116,12 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -145,13 +146,13 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -176,13 +177,13 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([]); - $family->shouldReceive('getSpouse')->andReturn($spouse); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection()); + $family->shouldReceive('spouse')->andReturn($spouse); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -202,11 +203,11 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -227,11 +228,11 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1800')); $census = Mockery::mock(CensusInterface::class); @@ -252,11 +253,11 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -277,11 +278,11 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase { $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('1820')); $census = Mockery::mock(CensusInterface::class); @@ -304,12 +305,12 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('M'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); @@ -331,12 +332,12 @@ class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase $family = Mockery::mock(Family::class); $family->shouldReceive('getMarriageDate')->andReturn(new Date('')); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); - $family->shouldReceive('facts')->with(['DIV'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); + $family->shouldReceive('facts')->with(['DIV'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('sex')->andReturn('F'); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php index 96b89eb584..aa3472c3b3 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php @@ -68,10 +68,10 @@ class CensusColumnFatherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestC $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Miami, Florida, United States')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getHusband')->andReturn($father); + $family->shouldReceive('husband')->andReturn($father); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('United States'); diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php index 537cc910e6..c5b7429fc2 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php @@ -68,10 +68,10 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getHusband')->andReturn($father); + $family->shouldReceive('husband')->andReturn($father); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -93,10 +93,10 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getHusband')->andReturn($father); + $family->shouldReceive('husband')->andReturn($father); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('Ireland'); @@ -115,10 +115,10 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParent(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('getHusband')->andReturn(null); + $family->shouldReceive('husband')->andReturn(null); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -137,7 +137,7 @@ class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParentFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null); + $individual->shouldReceive('primaryChildFamily')->andReturn(null); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php index ef93ada4ed..f8da739365 100644 --- a/tests/app/Census/CensusColumnFatherForeignTest.php +++ b/tests/app/Census/CensusColumnFatherForeignTest.php @@ -64,10 +64,10 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getHusband')->andReturn($father); + $family->shouldReceive('husband')->andReturn($father); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -89,10 +89,10 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getHusband')->andReturn($father); + $family->shouldReceive('husband')->andReturn($father); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('Ireland'); @@ -111,10 +111,10 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParent(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('getHusband')->andReturn(null); + $family->shouldReceive('husband')->andReturn(null); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -133,7 +133,7 @@ class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParentFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null); + $individual->shouldReceive('primaryChildFamily')->andReturn(null); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php index 96b03a534a..53cdd6f2d1 100644 --- a/tests/app/Census/CensusColumnFullNameTest.php +++ b/tests/app/Census/CensusColumnFullNameTest.php @@ -18,6 +18,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -45,7 +46,7 @@ class CensusColumnFullNameTest extends \Fisharebest\Webtrees\TestCase { $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getAllNames')->andReturn([['full' => 'Joe Bloggs']]); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn(''); diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php index d2dbb4a833..08db8f051b 100644 --- a/tests/app/Census/CensusColumnGivenNamesTest.php +++ b/tests/app/Census/CensusColumnGivenNamesTest.php @@ -18,6 +18,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php index 4b6c0110f6..7e0e6b28b7 100644 --- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -50,10 +51,10 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -75,10 +76,10 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('date')->andReturn(new Date('01 JAN 1859')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -100,10 +101,10 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('date')->andReturn(new Date('02 JUN 1860')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -122,10 +123,10 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase public function testNoMarriage(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -144,7 +145,7 @@ class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php index 84cb52e06e..fcbcb52234 100644 --- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -50,10 +51,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes $fact->shouldReceive('date')->andReturn(new Date('01 DEC 1859')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -75,10 +76,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes $fact->shouldReceive('date')->andReturn(new Date('01 JAN 1859')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -100,10 +101,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes $fact->shouldReceive('date')->andReturn(new Date('02 JUN 1860')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -122,10 +123,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes public function testNoMarriage(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'])->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'])->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -144,7 +145,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\Tes public function testNoSpouseFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php index 19e0a0fb53..3e2543a8ba 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php @@ -68,10 +68,10 @@ class CensusColumnMotherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestC $father->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Miami, Florida, United States')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getWife')->andReturn($father); + $family->shouldReceive('wife')->andReturn($father); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('United States'); diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php index 7d604dcccd..a18fc0f36f 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php @@ -68,10 +68,10 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getWife')->andReturn($mother); + $family->shouldReceive('wife')->andReturn($mother); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -93,10 +93,10 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getWife')->andReturn($mother); + $family->shouldReceive('wife')->andReturn($mother); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('Ireland'); @@ -115,10 +115,10 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParent(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('getWife')->andReturn(null); + $family->shouldReceive('wife')->andReturn(null); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -137,7 +137,7 @@ class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParentFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null); + $individual->shouldReceive('primaryChildFamily')->andReturn(null); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php index fe29f4dce7..09aa074204 100644 --- a/tests/app/Census/CensusColumnMotherForeignTest.php +++ b/tests/app/Census/CensusColumnMotherForeignTest.php @@ -64,10 +64,10 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getWife')->andReturn($mother); + $family->shouldReceive('wife')->andReturn($mother); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -89,10 +89,10 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase $mother->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); $family = Mockery::mock(Family::class); - $family->shouldReceive('getWife')->andReturn($mother); + $family->shouldReceive('wife')->andReturn($mother); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('Ireland'); @@ -111,10 +111,10 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParent(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('getWife')->andReturn(null); + $family->shouldReceive('wife')->andReturn(null); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn($family); + $individual->shouldReceive('primaryChildFamily')->andReturn($family); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -133,7 +133,7 @@ class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase public function testPlaceNoParentFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getPrimaryChildFamily')->andReturn(null); + $individual->shouldReceive('primaryChildFamily')->andReturn(null); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php index 132b2b15f8..a095b5abe1 100644 --- a/tests/app/Census/CensusColumnNationalityTest.php +++ b/tests/app/Census/CensusColumnNationalityTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Illuminate\Support\Collection; use Mockery; /** @@ -63,7 +64,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase { $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('')); - $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]); + $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('Deutschland'); @@ -83,7 +84,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase { $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('Australia')); - $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]); + $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -103,7 +104,7 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase { $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); - $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([]); + $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); @@ -137,10 +138,10 @@ class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getBirthPlace')->andReturn($this->getPlaceMock('London, England')); - $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn([ + $individual->shouldReceive('facts')->with(['IMMI', 'EMIG', 'NATU'], true)->andReturn(new Collection([ $fact1, $fact2, - ]); + ])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusPlace')->andReturn('England'); diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php index 6ddbe49373..9c15af3b65 100644 --- a/tests/app/Census/CensusColumnOccupationTest.php +++ b/tests/app/Census/CensusColumnOccupationTest.php @@ -18,6 +18,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -44,7 +45,7 @@ class CensusColumnOccupationTest extends \Fisharebest\Webtrees\TestCase public function testNoOccupation(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('facts')->with(['OCCU'])->andReturn([]); + $individual->shouldReceive('facts')->with(['OCCU'])->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); @@ -65,7 +66,7 @@ class CensusColumnOccupationTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('value')->andReturn('Farmer'); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('facts')->with(['OCCU'])->andReturn([$fact]); + $individual->shouldReceive('facts')->with(['OCCU'])->andReturn(new Collection([$fact])); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php index dabb604f0f..493950a68a 100644 --- a/tests/app/Census/CensusColumnSexMFTest.php +++ b/tests/app/Census/CensusColumnSexMFTest.php @@ -44,7 +44,7 @@ class CensusColumnSexMFTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -62,7 +62,7 @@ class CensusColumnSexMFTest extends \Fisharebest\Webtrees\TestCase public function testFeale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -80,7 +80,7 @@ class CensusColumnSexMFTest extends \Fisharebest\Webtrees\TestCase public function testUnknownSex(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('U'); + $individual->shouldReceive('sex')->andReturn('U'); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php index 53824543de..5d66faf424 100644 --- a/tests/app/Census/CensusColumnSexMKTest.php +++ b/tests/app/Census/CensusColumnSexMKTest.php @@ -44,7 +44,7 @@ class CensusColumnSexMKTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -62,7 +62,7 @@ class CensusColumnSexMKTest extends \Fisharebest\Webtrees\TestCase public function testFeale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -80,7 +80,7 @@ class CensusColumnSexMKTest extends \Fisharebest\Webtrees\TestCase public function testUnknownSex(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('U'); + $individual->shouldReceive('sex')->andReturn('U'); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php index 9d53f838a9..0865656a8d 100644 --- a/tests/app/Census/CensusColumnSexMZTest.php +++ b/tests/app/Census/CensusColumnSexMZTest.php @@ -44,7 +44,7 @@ class CensusColumnSexMZTest extends \Fisharebest\Webtrees\TestCase public function testMale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('M'); + $individual->shouldReceive('sex')->andReturn('M'); $census = Mockery::mock(CensusInterface::class); @@ -62,7 +62,7 @@ class CensusColumnSexMZTest extends \Fisharebest\Webtrees\TestCase public function testFeale(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('F'); + $individual->shouldReceive('sex')->andReturn('F'); $census = Mockery::mock(CensusInterface::class); @@ -80,7 +80,7 @@ class CensusColumnSexMZTest extends \Fisharebest\Webtrees\TestCase public function testUnknownSex(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSex')->andReturn('U'); + $individual->shouldReceive('sex')->andReturn('U'); $census = Mockery::mock(CensusInterface::class); diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php index 13503b6aeb..5ad2730b43 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php @@ -18,6 +18,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -50,7 +51,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \Fisharebest\Webtrees\Test 'surname' => 'Sixpack', ], ]); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn(''); @@ -75,7 +76,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \Fisharebest\Webtrees\Test 'surname' => 'Sixpack', ], ]); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn(''); diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php index 801fb9034a..68a89a264f 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php @@ -18,6 +18,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -50,7 +51,7 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase 'surname' => 'Sixpack', ], ]); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn(''); @@ -75,7 +76,7 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase 'surname' => 'Sixpack', ], ]); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn(''); @@ -95,7 +96,7 @@ class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase { $individual = Mockery::mock(Individual::class); $individual->shouldReceive('getAllNames')->andReturn([]); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn(''); diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php index e01210a141..6f65c36da7 100644 --- a/tests/app/Census/CensusColumnSurnameTest.php +++ b/tests/app/Census/CensusColumnSurnameTest.php @@ -18,6 +18,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php index 41a39fd78b..730e55a4a8 100644 --- a/tests/app/Census/CensusColumnYearsMarriedTest.php +++ b/tests/app/Census/CensusColumnYearsMarriedTest.php @@ -21,6 +21,7 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Illuminate\Support\Collection; use Mockery; /** @@ -47,7 +48,7 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase public function testNoSpouseFamily(): void { $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection()); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -66,10 +67,10 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase public function testNoMarriage(): void { $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([]); + $family->shouldReceive('facts')->with(['MARR'], true)->andReturn(new Collection()); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -91,10 +92,10 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('date')->andReturn(new Date('')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'], true)->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -116,10 +117,10 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('date')->andReturn(new Date('1861')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'], true)->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); @@ -141,10 +142,10 @@ class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase $fact->shouldReceive('date')->andReturn(new Date('OCT 1851')); $family = Mockery::mock(Family::class); - $family->shouldReceive('facts')->with(['MARR'], true)->andReturn([$fact]); + $family->shouldReceive('facts')->with(['MARR'], true)->andReturn(new Collection([$fact])); $individual = Mockery::mock(Individual::class); - $individual->shouldReceive('getSpouseFamilies')->andReturn([$family]); + $individual->shouldReceive('spouseFamilies')->andReturn(new Collection([$family])); $census = Mockery::mock(CensusInterface::class); $census->shouldReceive('censusDate')->andReturn('01 JUN 1860'); |