summaryrefslogtreecommitdiff
path: root/tests/app/Census/CensusOfUnitedStates1880Test.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/app/Census/CensusOfUnitedStates1880Test.php')
-rw-r--r--tests/app/Census/CensusOfUnitedStates1880Test.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/app/Census/CensusOfUnitedStates1880Test.php b/tests/app/Census/CensusOfUnitedStates1880Test.php
index 63b01546de..36c2c0f4cb 100644
--- a/tests/app/Census/CensusOfUnitedStates1880Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1880Test.php
@@ -51,7 +51,7 @@ class CensusOfUnitedStates1880Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
- $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+ $this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear', $columns[8]);
$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[9]);
$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
@@ -72,12 +72,12 @@ class CensusOfUnitedStates1880Test extends \PHPUnit_Framework_TestCase {
$this->assertSame('Sex', $columns[2]->abbreviation());
$this->assertSame('Mon', $columns[3]->abbreviation());
$this->assertSame('Relation', $columns[4]->abbreviation());
- $this->assertSame('Single', $columns[5]->abbreviation());
- $this->assertSame('Married', $columns[6]->abbreviation());
- $this->assertSame('Write', $columns[7]->abbreviation());
+ $this->assertSame('S', $columns[5]->abbreviation());
+ $this->assertSame('M', $columns[6]->abbreviation());
+ $this->assertSame('W/D', $columns[7]->abbreviation());
$this->assertSame('MY', $columns[8]->abbreviation());
$this->assertSame('Occupation', $columns[9]->abbreviation());
- $this->assertSame('Un', $columns[10]->abbreviation());
+ $this->assertSame('UnEm', $columns[10]->abbreviation());
$this->assertSame('Sick', $columns[11]->abbreviation());
$this->assertSame('Blind', $columns[12]->abbreviation());
$this->assertSame('DD', $columns[13]->abbreviation());
@@ -87,9 +87,9 @@ class CensusOfUnitedStates1880Test extends \PHPUnit_Framework_TestCase {
$this->assertSame('School', $columns[17]->abbreviation());
$this->assertSame('Read', $columns[18]->abbreviation());
$this->assertSame('Write', $columns[19]->abbreviation());
- $this->assertSame('Birthplace', $columns[20]->abbreviation());
- $this->assertSame('Father’s birthplace', $columns[21]->abbreviation());
- $this->assertSame('Mother’s birthplace', $columns[22]->abbreviation());
+ $this->assertSame('BP', $columns[20]->abbreviation());
+ $this->assertSame('FBP', $columns[21]->abbreviation());
+ $this->assertSame('MBP', $columns[22]->abbreviation());
$this->assertSame('Name', $columns[0]->title());
$this->assertSame('Age', $columns[1]->title());