diff options
Diffstat (limited to 'tests/app/Census')
54 files changed, 246 insertions, 246 deletions
diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php index 759f1584e7..2a344c061c 100644 --- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php @@ -45,7 +45,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale5Years($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -63,7 +63,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale5Years($census, '', ''); - $this->assertSame('30', $column->generate($individual)); + $this->assertSame('30', $column->generate($individual, $individual)); } /** @@ -81,7 +81,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale5Years($census, '', ''); - $this->assertSame('30', $column->generate($individual)); + $this->assertSame('30', $column->generate($individual, $individual)); } /** @@ -99,7 +99,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale5Years($census, '', ''); - $this->assertSame('0', $column->generate($individual)); + $this->assertSame('0', $column->generate($individual, $individual)); } /** @@ -117,7 +117,7 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale5Years($census, '', ''); - $this->assertSame('14', $column->generate($individual)); + $this->assertSame('14', $column->generate($individual, $individual)); } /** @@ -135,6 +135,6 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale5Years($census, '', ''); - $this->assertSame('40', $column->generate($individual)); + $this->assertSame('40', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php index 9600212032..c72fb4de6e 100644 --- a/tests/app/Census/CensusColumnAgeFemaleTest.php +++ b/tests/app/Census/CensusColumnAgeFemaleTest.php @@ -45,7 +45,7 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -63,7 +63,7 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale($census, '', ''); - $this->assertSame('32', $column->generate($individual)); + $this->assertSame('32', $column->generate($individual, $individual)); } /** @@ -81,7 +81,7 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale($census, '', ''); - $this->assertSame('32', $column->generate($individual)); + $this->assertSame('32', $column->generate($individual, $individual)); } /** @@ -99,6 +99,6 @@ class CensusColumnAgeFemaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeFemale($census, '', ''); - $this->assertSame('0', $column->generate($individual)); + $this->assertSame('0', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php index 08f7edd470..9d22094d4c 100644 --- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php @@ -47,7 +47,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale5Years($census, '', ''); - $this->assertSame('30', $column->generate($individual)); + $this->assertSame('30', $column->generate($individual, $individual)); } /** @@ -63,7 +63,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale5Years($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -81,7 +81,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale5Years($census, '', ''); - $this->assertSame('30', $column->generate($individual)); + $this->assertSame('30', $column->generate($individual, $individual)); } /** @@ -99,7 +99,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale5Years($census, '', ''); - $this->assertSame('0', $column->generate($individual)); + $this->assertSame('0', $column->generate($individual, $individual)); } /** @@ -117,7 +117,7 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale5Years($census, '', ''); - $this->assertSame('14', $column->generate($individual)); + $this->assertSame('14', $column->generate($individual, $individual)); } /** @@ -135,6 +135,6 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale5Years($census, '', ''); - $this->assertSame('40', $column->generate($individual)); + $this->assertSame('40', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php index 87b3741eba..651718d7a1 100644 --- a/tests/app/Census/CensusColumnAgeMaleTest.php +++ b/tests/app/Census/CensusColumnAgeMaleTest.php @@ -47,7 +47,7 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale($census, '', ''); - $this->assertSame('32', $column->generate($individual)); + $this->assertSame('32', $column->generate($individual, $individual)); } /** @@ -63,7 +63,7 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -81,7 +81,7 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale($census, '', ''); - $this->assertSame('32', $column->generate($individual)); + $this->assertSame('32', $column->generate($individual, $individual)); } /** @@ -99,6 +99,6 @@ class CensusColumnAgeMaleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMale($census, '', ''); - $this->assertSame('0', $column->generate($individual)); + $this->assertSame('0', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php index 1a1d85bdf4..1317211a39 100644 --- a/tests/app/Census/CensusColumnAgeMarriedTest.php +++ b/tests/app/Census/CensusColumnAgeMarriedTest.php @@ -53,7 +53,7 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMarried($census, '', ''); - $this->assertSame(19, $column->generate($individual)); + $this->assertSame(19, $column->generate($individual, $individual)); } /** @@ -71,7 +71,7 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMarried($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -92,7 +92,7 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMarried($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -110,6 +110,6 @@ class CensusColumnAgeMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAgeMarried($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php index c3243757ab..12cd5b0b30 100644 --- a/tests/app/Census/CensusColumnAgeTest.php +++ b/tests/app/Census/CensusColumnAgeTest.php @@ -46,6 +46,6 @@ class CensusColumnAgeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnAge($census, '', ''); - $this->assertSame('32', $column->generate($individual)); + $this->assertSame('32', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php index b4c0db850c..9ac27299a8 100644 --- a/tests/app/Census/CensusColumnBirthDateTest.php +++ b/tests/app/Census/CensusColumnBirthDateTest.php @@ -51,6 +51,6 @@ class CensusColumnBirthDateTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthDate($census, '', ''); - $this->assertSame('1 1 1800', $column->generate($individual)); + $this->assertSame('1 1 1800', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php index ce4cdc904c..65b1a223b1 100644 --- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php +++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php @@ -53,6 +53,6 @@ class CensusColumnBirthDayDotMonthYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthDayDotMonthYear($census, '', ''); - $this->assertSame('30. June 1832', $column->generate($individual)); + $this->assertSame('30. June 1832', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php index fe65ff1207..f934a521de 100644 --- a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php +++ b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php @@ -53,6 +53,6 @@ class CensusColumnBirthDayMonthSlashYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthDayMonthSlashYear($census, '', ''); - $this->assertSame('30 Jun/1832', $column->generate($individual)); + $this->assertSame('30 Jun/1832', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php index 4e80150e20..a2c0165f31 100644 --- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php +++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php @@ -53,6 +53,6 @@ class CensusColumnBirthDaySlashMonthTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthDaySlashMonth($census, '', ''); - $this->assertSame('30/6', $column->generate($individual)); + $this->assertSame('30/6', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php index 947c0ddce4..a6a9b46239 100644 --- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php +++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php @@ -53,6 +53,6 @@ class CensusColumnBirthDaySlashMonthYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthDaySlashMonthYear($census, '', ''); - $this->assertSame('30/6 1832', $column->generate($individual)); + $this->assertSame('30/6 1832', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthDayTest.php b/tests/app/Census/CensusColumnBirthDayTest.php index b4ce9f64e1..c18e694104 100644 --- a/tests/app/Census/CensusColumnBirthDayTest.php +++ b/tests/app/Census/CensusColumnBirthDayTest.php @@ -51,6 +51,6 @@ class CensusColumnBirthDayTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthDay($census, '', ''); - $this->assertSame('30', $column->generate($individual)); + $this->assertSame('30', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php index 1c122f8b34..ff38247f92 100644 --- a/tests/app/Census/CensusColumnBirthMonthTest.php +++ b/tests/app/Census/CensusColumnBirthMonthTest.php @@ -51,6 +51,6 @@ class CensusColumnBirthMonthTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthMonth($census, '', ''); - $this->assertSame('Jan', $column->generate($individual)); + $this->assertSame('Jan', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php index f6e01fa0d5..de3f649855 100644 --- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php @@ -60,7 +60,7 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthPlaceSimple($census, '', ''); - $this->assertSame('England', $column->generate($individual)); + $this->assertSame('England', $column->generate($individual, $individual)); } /** @@ -77,7 +77,7 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthPlaceSimple($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -94,7 +94,7 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthPlaceSimple($census, '', ''); - $this->assertSame('Maryland', $column->generate($individual)); + $this->assertSame('Maryland', $column->generate($individual, $individual)); } /** @@ -111,6 +111,6 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthPlaceSimple($census, '', ''); - $this->assertSame('Florida', $column->generate($individual)); + $this->assertSame('Florida', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php index c2d126d775..f5615e9fd6 100644 --- a/tests/app/Census/CensusColumnBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnBirthPlaceTest.php @@ -60,7 +60,7 @@ class CensusColumnBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthPlace($census, '', ''); - $this->assertSame('Westminster, London', $column->generate($individual)); + $this->assertSame('Westminster, London', $column->generate($individual, $individual)); } /** @@ -77,7 +77,7 @@ class CensusColumnBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthPlace($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -94,6 +94,6 @@ class CensusColumnBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthPlace($census, '', ''); - $this->assertSame('Paris, France', $column->generate($individual)); + $this->assertSame('Paris, France', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php index 27cda0a541..ab09dff7c7 100644 --- a/tests/app/Census/CensusColumnBirthYearTest.php +++ b/tests/app/Census/CensusColumnBirthYearTest.php @@ -51,6 +51,6 @@ class CensusColumnBirthYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBirthYear($census, '', ''); - $this->assertSame('1800', $column->generate($individual)); + $this->assertSame('1800', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php index 828d38e119..03afe01c0d 100644 --- a/tests/app/Census/CensusColumnBornForeignPartsTest.php +++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php @@ -63,7 +63,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -80,7 +80,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -97,7 +97,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -114,7 +114,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('I', $column->generate($individual)); + $this->assertSame('I', $column->generate($individual, $individual)); } /** @@ -131,7 +131,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('F', $column->generate($individual)); + $this->assertSame('F', $column->generate($individual, $individual)); } /** @@ -148,7 +148,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('E', $column->generate($individual)); + $this->assertSame('E', $column->generate($individual, $individual)); } /** @@ -165,7 +165,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('E', $column->generate($individual)); + $this->assertSame('E', $column->generate($individual, $individual)); } /** @@ -182,7 +182,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -199,7 +199,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -216,7 +216,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('F', $column->generate($individual)); + $this->assertSame('F', $column->generate($individual, $individual)); } /** @@ -233,7 +233,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('E', $column->generate($individual)); + $this->assertSame('E', $column->generate($individual, $individual)); } /** @@ -250,7 +250,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('E', $column->generate($individual)); + $this->assertSame('E', $column->generate($individual, $individual)); } /** @@ -267,7 +267,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -284,7 +284,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('I', $column->generate($individual)); + $this->assertSame('I', $column->generate($individual, $individual)); } /** @@ -301,7 +301,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('F', $column->generate($individual)); + $this->assertSame('F', $column->generate($individual, $individual)); } /** @@ -318,7 +318,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -335,7 +335,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -352,7 +352,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -369,7 +369,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('I', $column->generate($individual)); + $this->assertSame('I', $column->generate($individual, $individual)); } /** @@ -386,7 +386,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('F', $column->generate($individual)); + $this->assertSame('F', $column->generate($individual, $individual)); } /** @@ -403,7 +403,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -420,7 +420,7 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -437,6 +437,6 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnBornForeignParts($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php index 373573d848..ba1eed03cd 100644 --- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php +++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php @@ -45,7 +45,7 @@ class CensusColumnChildrenBornAliveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnChildrenBornAlive($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -91,6 +91,6 @@ class CensusColumnChildrenBornAliveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnChildrenBornAlive($census, '', ''); - $this->assertSame('3', $column->generate($individual)); + $this->assertSame('3', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php index 0df9c15706..2ae24b23bb 100644 --- a/tests/app/Census/CensusColumnChildrenDiedTest.php +++ b/tests/app/Census/CensusColumnChildrenDiedTest.php @@ -45,7 +45,7 @@ class CensusColumnChildrenDiedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnChildrenDied($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -91,6 +91,6 @@ class CensusColumnChildrenDiedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnChildrenDied($census, '', ''); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php index e2bf8a4ef2..5cd8f72acb 100644 --- a/tests/app/Census/CensusColumnChildrenLivingTest.php +++ b/tests/app/Census/CensusColumnChildrenLivingTest.php @@ -45,7 +45,7 @@ class CensusColumnChildrenLivingTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnChildrenLiving($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -91,6 +91,6 @@ class CensusColumnChildrenLivingTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnChildrenLiving($census, '', ''); - $this->assertSame('2', $column->generate($individual)); + $this->assertSame('2', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php index 998d73e6a6..c46ea28a50 100644 --- a/tests/app/Census/CensusColumnConditionDanishTest.php +++ b/tests/app/Census/CensusColumnConditionDanishTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); - $this->assertSame('Ugift', $column->generate($individual)); + $this->assertSame('Ugift', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); - $this->assertSame('Ugift', $column->generate($individual)); + $this->assertSame('Ugift', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Ugift', $column->generate($individual)); + $this->assertSame('Ugift', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Ugift', $column->generate($individual)); + $this->assertSame('Ugift', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Gift', $column->generate($individual)); + $this->assertSame('Gift', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Gift', $column->generate($individual)); + $this->assertSame('Gift', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); - $this->assertSame('Ugift', $column->generate($individual)); + $this->assertSame('Ugift', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); - $this->assertSame('Ugift', $column->generate($individual)); + $this->assertSame('Ugift', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Skilt', $column->generate($individual)); + $this->assertSame('Skilt', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionDanishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionDanish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Skilt', $column->generate($individual)); + $this->assertSame('Skilt', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php index c629932f49..e100ef8e04 100644 --- a/tests/app/Census/CensusColumnConditionEnglishTest.php +++ b/tests/app/Census/CensusColumnConditionEnglishTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); - $this->assertSame('Unm', $column->generate($individual)); + $this->assertSame('Unm', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); - $this->assertSame('Unm', $column->generate($individual)); + $this->assertSame('Unm', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Unm', $column->generate($individual)); + $this->assertSame('Unm', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Unm', $column->generate($individual)); + $this->assertSame('Unm', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Wid', $column->generate($individual)); + $this->assertSame('Wid', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Wid', $column->generate($individual)); + $this->assertSame('Wid', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); - $this->assertSame('Unm', $column->generate($individual)); + $this->assertSame('Unm', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); - $this->assertSame('Unm', $column->generate($individual)); + $this->assertSame('Unm', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Div', $column->generate($individual)); + $this->assertSame('Div', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionEnglishTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionEnglish($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('Div', $column->generate($individual)); + $this->assertSame('Div', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php index d8f4b110b2..d10a0d6ca4 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionFrenchFemmeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFemme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php index 71dd357040..16f2abdcd1 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionFrenchFilleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchFille($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php index dd8d8a93f3..b1fcc374bc 100644 --- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionFrenchGarconTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchGarcon($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php index 701dcb9a9a..1dd9c7923c 100644 --- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionFrenchHommeTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchHomme($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php index de476bf41f..34d808dbff 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionFrenchVeufTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuf($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php index ee3ddcac3d..13aa9a84b9 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('1', $column->generate($individual)); + $this->assertSame('1', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionFrenchVeuveTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionFrenchVeuve($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php index 6a3c56474c..6102f754d7 100644 --- a/tests/app/Census/CensusColumnConditionUsTest.php +++ b/tests/app/Census/CensusColumnConditionUsTest.php @@ -48,7 +48,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -67,7 +67,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -90,7 +90,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -113,7 +113,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -142,7 +142,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('W', $column->generate($individual)); + $this->assertSame('W', $column->generate($individual, $individual)); } /** @@ -171,7 +171,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('W', $column->generate($individual)); + $this->assertSame('W', $column->generate($individual, $individual)); } /** @@ -194,7 +194,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -217,7 +217,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -240,7 +240,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -263,7 +263,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); - $this->assertSame('S', $column->generate($individual)); + $this->assertSame('S', $column->generate($individual, $individual)); } /** @@ -288,7 +288,7 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('D', $column->generate($individual)); + $this->assertSame('D', $column->generate($individual, $individual)); } /** @@ -313,6 +313,6 @@ class CensusColumnConditionUsTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnConditionUs($census, '', ''); $census->shouldReceive('censusDate')->andReturn('30 JUN 1830'); - $this->assertSame('D', $column->generate($individual)); + $this->assertSame('D', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php index e89a2040a7..c4ebcafccc 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php @@ -69,6 +69,6 @@ class CensusColumnFatherBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherBirthPlaceSimple($census, '', ''); - $this->assertSame('Florida', $column->generate($individual)); + $this->assertSame('Florida', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php index e0a50b9037..94fde273fc 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php @@ -69,7 +69,7 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherBirthPlace($census, '', ''); - $this->assertSame('London', $column->generate($individual)); + $this->assertSame('London', $column->generate($individual, $individual)); } /** @@ -92,7 +92,7 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherBirthPlace($census, '', ''); - $this->assertSame('London, England', $column->generate($individual)); + $this->assertSame('London, England', $column->generate($individual, $individual)); } /** @@ -112,7 +112,7 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherBirthPlace($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -129,6 +129,6 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherBirthPlace($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php index 570ff5ca10..aaee42f282 100644 --- a/tests/app/Census/CensusColumnFatherForeignTest.php +++ b/tests/app/Census/CensusColumnFatherForeignTest.php @@ -66,7 +66,7 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherForeign($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -89,7 +89,7 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherForeign($census, '', ''); - $this->assertSame('Y', $column->generate($individual)); + $this->assertSame('Y', $column->generate($individual, $individual)); } /** @@ -109,7 +109,7 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherForeign($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -126,6 +126,6 @@ class CensusColumnFatherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFatherForeign($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php index 3cb861d77e..1785a40972 100644 --- a/tests/app/Census/CensusColumnFullNameTest.php +++ b/tests/app/Census/CensusColumnFullNameTest.php @@ -46,6 +46,6 @@ class CensusColumnFullNameTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnFullName($census, '', ''); - $this->assertSame('Joe Bloggs', $column->generate($individual)); + $this->assertSame('Joe Bloggs', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php index bd76f0466a..85c97a72b6 100644 --- a/tests/app/Census/CensusColumnGivenNameInitialTest.php +++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php @@ -44,7 +44,7 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnGivenNameInitial($census, '', ''); - $this->assertSame('Joe', $column->generate($individual)); + $this->assertSame('Joe', $column->generate($individual, $individual)); } /** @@ -60,7 +60,7 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnGivenNameInitial($census, '', ''); - $this->assertSame('Joe F', $column->generate($individual)); + $this->assertSame('Joe F', $column->generate($individual, $individual)); } /** @@ -76,6 +76,6 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnGivenNameInitial($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php index 95cd829a99..c78c0adbac 100644 --- a/tests/app/Census/CensusColumnGivenNamesTest.php +++ b/tests/app/Census/CensusColumnGivenNamesTest.php @@ -44,7 +44,7 @@ class CensusColumnGivenNamesTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnGivenNames($census, '', ''); - $this->assertSame('Joe', $column->generate($individual)); + $this->assertSame('Joe', $column->generate($individual, $individual)); } /** @@ -60,6 +60,6 @@ class CensusColumnGivenNamesTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnGivenNames($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php index a850a7f3f1..f608d7ff8f 100644 --- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php @@ -52,7 +52,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMarriedWithinYear($census, '', ''); - $this->assertSame('Y', $column->generate($individual)); + $this->assertSame('Y', $column->generate($individual, $individual)); } /** @@ -75,7 +75,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -98,7 +98,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -118,7 +118,7 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -135,6 +135,6 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php index 98be4925bd..aaf323613b 100644 --- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php @@ -46,7 +46,7 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); - $this->assertSame('Jan', $column->generate($individual)); + $this->assertSame('Jan', $column->generate($individual, $individual)); } /** @@ -63,7 +63,7 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -81,7 +81,7 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } @@ -99,6 +99,6 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMonthIfBornWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php index 8f2014d300..4f8c758671 100644 --- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php @@ -52,7 +52,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); - $this->assertSame('Dec', $column->generate($individual)); + $this->assertSame('Dec', $column->generate($individual, $individual)); } /** @@ -75,7 +75,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -98,7 +98,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -118,7 +118,7 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -135,6 +135,6 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit\Framework\TestCa $column = new CensusColumnMonthIfMarriedWithinYear($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php index 7a646b3642..a7554aca86 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php @@ -69,6 +69,6 @@ class CensusColumnMotherBirthPlaceSimpleTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherBirthPlaceSimple($census, '', ''); - $this->assertSame('Florida', $column->generate($individual)); + $this->assertSame('Florida', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php index 3fae6e72b4..c6ad42f4bd 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php @@ -69,7 +69,7 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherBirthPlace($census, '', ''); - $this->assertSame('London', $column->generate($individual)); + $this->assertSame('London', $column->generate($individual, $individual)); } /** @@ -92,7 +92,7 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherBirthPlace($census, '', ''); - $this->assertSame('London, England', $column->generate($individual)); + $this->assertSame('London, England', $column->generate($individual, $individual)); } /** @@ -112,7 +112,7 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherBirthPlace($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -129,6 +129,6 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherBirthPlace($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php index d21169b138..3354adaf69 100644 --- a/tests/app/Census/CensusColumnMotherForeignTest.php +++ b/tests/app/Census/CensusColumnMotherForeignTest.php @@ -66,7 +66,7 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherForeign($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -89,7 +89,7 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherForeign($census, '', ''); - $this->assertSame('Y', $column->generate($individual)); + $this->assertSame('Y', $column->generate($individual, $individual)); } /** @@ -109,7 +109,7 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherForeign($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -126,6 +126,6 @@ class CensusColumnMotherForeignTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnMotherForeign($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php index 3618079acd..55d4942f21 100644 --- a/tests/app/Census/CensusColumnNationalityTest.php +++ b/tests/app/Census/CensusColumnNationalityTest.php @@ -62,7 +62,7 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnNationality($census, '', ''); - $this->assertSame('Deutsch', $column->generate($individual)); + $this->assertSame('Deutsch', $column->generate($individual, $individual)); } /** @@ -80,7 +80,7 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnNationality($census, '', ''); - $this->assertSame('Australia', $column->generate($individual)); + $this->assertSame('Australia', $column->generate($individual, $individual)); } /** @@ -98,7 +98,7 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnNationality($census, '', ''); - $this->assertSame('British', $column->generate($individual)); + $this->assertSame('British', $column->generate($individual, $individual)); } /** @@ -134,6 +134,6 @@ class CensusColumnNationalityTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnNationality($census, '', ''); - $this->assertSame('United States', $column->generate($individual)); + $this->assertSame('United States', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php index 4f8682971c..d4443ec996 100644 --- a/tests/app/Census/CensusColumnNullTest.php +++ b/tests/app/Census/CensusColumnNullTest.php @@ -43,6 +43,6 @@ class CensusColumnNullTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnNull($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php index 22fb195f1b..cb466af73a 100644 --- a/tests/app/Census/CensusColumnOccupationTest.php +++ b/tests/app/Census/CensusColumnOccupationTest.php @@ -44,7 +44,7 @@ class CensusColumnOccupationTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnOccupation($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -63,6 +63,6 @@ class CensusColumnOccupationTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnOccupation($census, '', ''); - $this->assertSame('Farmer', $column->generate($individual)); + $this->assertSame('Farmer', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php index 31837707de..5c57b38120 100644 --- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php @@ -43,6 +43,6 @@ class CensusColumnRelationToHeadGermanTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnRelationToHeadGerman($census, '', ''); - $this->assertSame('Haushaltungsvorstand', $column->generate($individual)); + $this->assertSame('Haushaltungsvorstand', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php index d567fd1b45..5214daf224 100644 --- a/tests/app/Census/CensusColumnRelationToHeadTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadTest.php @@ -43,6 +43,6 @@ class CensusColumnRelationToHeadTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnRelationToHead($census, '', ''); - $this->assertSame('head', $column->generate($individual)); + $this->assertSame('head', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php index 34f022889c..2a8eca4d8e 100644 --- a/tests/app/Census/CensusColumnReligionTest.php +++ b/tests/app/Census/CensusColumnReligionTest.php @@ -44,6 +44,6 @@ class CensusColumnReligionTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnReligion($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php index 66233f087a..67a652e6b4 100644 --- a/tests/app/Census/CensusColumnSexMFTest.php +++ b/tests/app/Census/CensusColumnSexMFTest.php @@ -44,7 +44,7 @@ class CensusColumnSexMFTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMF($census, '', ''); - $this->assertSame('M', $column->generate($individual)); + $this->assertSame('M', $column->generate($individual, $individual)); } /** @@ -60,7 +60,7 @@ class CensusColumnSexMFTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMF($census, '', ''); - $this->assertSame('F', $column->generate($individual)); + $this->assertSame('F', $column->generate($individual, $individual)); } /** @@ -76,6 +76,6 @@ class CensusColumnSexMFTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMF($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php index 50b257591f..6e8ac20681 100644 --- a/tests/app/Census/CensusColumnSexMKTest.php +++ b/tests/app/Census/CensusColumnSexMKTest.php @@ -44,7 +44,7 @@ class CensusColumnSexMKTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMK($census, '', ''); - $this->assertSame('M', $column->generate($individual)); + $this->assertSame('M', $column->generate($individual, $individual)); } /** @@ -60,7 +60,7 @@ class CensusColumnSexMKTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMK($census, '', ''); - $this->assertSame('K', $column->generate($individual)); + $this->assertSame('K', $column->generate($individual, $individual)); } /** @@ -76,6 +76,6 @@ class CensusColumnSexMKTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMK($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php index d0839ec31e..e3563b5a8f 100644 --- a/tests/app/Census/CensusColumnSexMZTest.php +++ b/tests/app/Census/CensusColumnSexMZTest.php @@ -44,7 +44,7 @@ class CensusColumnSexMZTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMZ($census, '', ''); - $this->assertSame('M', $column->generate($individual)); + $this->assertSame('M', $column->generate($individual, $individual)); } /** @@ -60,7 +60,7 @@ class CensusColumnSexMZTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMZ($census, '', ''); - $this->assertSame('Ž', $column->generate($individual)); + $this->assertSame('Ž', $column->generate($individual, $individual)); } /** @@ -76,6 +76,6 @@ class CensusColumnSexMZTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSexMZ($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php index 967f1dc5f9..48857a632d 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php @@ -51,7 +51,7 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit\Framework\TestCas $column = new CensusColumnSurnameGivenNameInitial($census, '', ''); - $this->assertSame('Sixpack, Joe', $column->generate($individual)); + $this->assertSame('Sixpack, Joe', $column->generate($individual, $individual)); } /** @@ -74,6 +74,6 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit\Framework\TestCas $column = new CensusColumnSurnameGivenNameInitial($census, '', ''); - $this->assertSame('Sixpack, Joe F', $column->generate($individual)); + $this->assertSame('Sixpack, Joe F', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php index 8912e62303..749a879de5 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php @@ -51,7 +51,7 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSurnameGivenNames($census, '', ''); - $this->assertSame('Sixpack, Joe', $column->generate($individual)); + $this->assertSame('Sixpack, Joe', $column->generate($individual, $individual)); } /** @@ -74,7 +74,7 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSurnameGivenNames($census, '', ''); - $this->assertSame('Sixpack, Joe Fred', $column->generate($individual)); + $this->assertSame('Sixpack, Joe Fred', $column->generate($individual, $individual)); } /** @@ -92,6 +92,6 @@ class CensusColumnSurnameGivenNamesTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSurnameGivenNames($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php index 27fed2df04..72e180b7c3 100644 --- a/tests/app/Census/CensusColumnSurnameTest.php +++ b/tests/app/Census/CensusColumnSurnameTest.php @@ -44,7 +44,7 @@ class CensusColumnSurnameTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSurname($census, '', ''); - $this->assertSame('Bloggs', $column->generate($individual)); + $this->assertSame('Bloggs', $column->generate($individual, $individual)); } /** @@ -60,6 +60,6 @@ class CensusColumnSurnameTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnSurname($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php index 2d86fa8134..a3e66c1fc3 100644 --- a/tests/app/Census/CensusColumnYearsMarriedTest.php +++ b/tests/app/Census/CensusColumnYearsMarriedTest.php @@ -46,7 +46,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnYearsMarried($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -66,7 +66,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnYearsMarried($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -89,7 +89,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnYearsMarried($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -112,7 +112,7 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnYearsMarried($census, '', ''); - $this->assertSame('', $column->generate($individual)); + $this->assertSame('', $column->generate($individual, $individual)); } /** @@ -135,6 +135,6 @@ class CensusColumnYearsMarriedTest extends \PHPUnit\Framework\TestCase $column = new CensusColumnYearsMarried($census, '', ''); - $this->assertSame('8', $column->generate($individual)); + $this->assertSame('8', $column->generate($individual, $individual)); } } |