summaryrefslogtreecommitdiff
path: root/tests/app/Census
diff options
context:
space:
mode:
Diffstat (limited to 'tests/app/Census')
-rw-r--r--tests/app/Census/CensusColumnBirthDaySlashMonthTest.php57
-rw-r--r--tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php57
-rw-r--r--tests/app/Census/CensusColumnReligionTest.php50
-rw-r--r--tests/app/Census/CensusColumnSexMKTest.php77
-rw-r--r--tests/app/Census/CensusOfDenmark1787Test.php26
-rw-r--r--tests/app/Census/CensusOfDenmark1801Test.php26
-rw-r--r--tests/app/Census/CensusOfDenmark1803Test.php26
-rw-r--r--tests/app/Census/CensusOfDenmark1834Test.php23
-rw-r--r--tests/app/Census/CensusOfDenmark1835Test.php23
-rw-r--r--tests/app/Census/CensusOfDenmark1840Test.php23
-rw-r--r--tests/app/Census/CensusOfDenmark1845Test.php36
-rw-r--r--tests/app/Census/CensusOfDenmark1850Test.php47
-rw-r--r--tests/app/Census/CensusOfDenmark1855Test.php48
-rw-r--r--tests/app/Census/CensusOfDenmark1860Test.php54
-rw-r--r--tests/app/Census/CensusOfDenmark1870Test.php64
-rw-r--r--tests/app/Census/CensusOfDenmark1880Test.php60
-rw-r--r--tests/app/Census/CensusOfDenmark1885Test.php60
-rw-r--r--tests/app/Census/CensusOfDenmark1890Test.php70
-rw-r--r--tests/app/Census/CensusOfDenmark1895Test.php70
-rw-r--r--tests/app/Census/CensusOfDenmark1901Test.php79
-rw-r--r--tests/app/Census/CensusOfDenmark1906Test.php71
-rw-r--r--tests/app/Census/CensusOfDenmark1911Test.php40
-rw-r--r--tests/app/Census/CensusOfDenmark1916Test.php44
-rw-r--r--tests/app/Census/CensusOfDenmark1921Test.php44
-rw-r--r--tests/app/Census/CensusOfDenmark1925Test.php36
-rw-r--r--tests/app/Census/CensusOfDenmark1930Test.php44
-rw-r--r--tests/app/Census/CensusOfDenmark1940Test.php44
-rw-r--r--tests/app/Census/CensusOfDenmark1950Test.php44
28 files changed, 855 insertions, 488 deletions
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
new file mode 100644
index 0000000000..3f8dc6f061
--- /dev/null
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnBirthDaySlashMonthTest
+ */
+class CensusColumnBirthDaySlashMonthTest extends \PHPUnit_Framework_TestCase {
+ /**
+ * Delete mock objects
+ */
+ public function tearDown() {
+ Mockery::close();
+ }
+
+ /**
+ * @covers Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthTest
+ * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+ */
+ public function testGenerateColumn() {
+ $cal_date = Mockery::mock(Date\CalendarDate::class);
+ $cal_date->shouldReceive('format')->andReturn('30/6');
+
+ $date = Mockery::mock(Date::class);
+ $date->shouldReceive('minimumJulianDay')->andReturn($cal_date);
+ $date->shouldReceive('maximumJulianDay')->andReturn($cal_date);
+ $date->shouldReceive('minimumDate')->andReturn($cal_date);
+
+ $individual = Mockery::mock(Individual::class);
+ $individual->shouldReceive('getBirthDate')->andReturn($date);
+
+ $census = Mockery::mock(CensusInterface::class);
+ $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
+
+ $column = new CensusColumnBirthDaySlashMonth($census, '', '');
+
+ $this->assertSame('30/6', $column->generate($individual));
+ }
+}
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
new file mode 100644
index 0000000000..04492c341e
--- /dev/null
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnBirthDaySlashMonthYearTest
+ */
+class CensusColumnBirthDaySlashMonthYearTest extends \PHPUnit_Framework_TestCase {
+ /**
+ * Delete mock objects
+ */
+ public function tearDown() {
+ Mockery::close();
+ }
+
+ /**
+ * @covers Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYearTest
+ * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+ */
+ public function testGenerateColumn() {
+ $cal_date = Mockery::mock(Date\CalendarDate::class);
+ $cal_date->shouldReceive('format')->andReturn('30/6 1832');
+
+ $date = Mockery::mock(Date::class);
+ $date->shouldReceive('minimumJulianDay')->andReturn($cal_date);
+ $date->shouldReceive('maximumJulianDay')->andReturn($cal_date);
+ $date->shouldReceive('minimumDate')->andReturn($cal_date);
+
+ $individual = Mockery::mock(Individual::class);
+ $individual->shouldReceive('getBirthDate')->andReturn($date);
+
+ $census = Mockery::mock(CensusInterface::class);
+ $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
+
+ $column = new CensusColumnBirthDaySlashMonthYear($census, '', '');
+
+ $this->assertSame('30/6 1832', $column->generate($individual));
+ }
+}
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
new file mode 100644
index 0000000000..4aa0c222ad
--- /dev/null
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnReligion
+ */
+class CensusColumnReligionTest extends \PHPUnit_Framework_TestCase {
+ /**
+ * Delete mock objects
+ */
+ public function tearDown() {
+ Mockery::close();
+ }
+
+ /**
+ * @covers Fisharebest\Webtrees\Census\CensusColumnReligion
+ * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+ */
+ public function testReligion() {
+ $individual = Mockery::mock(Individual::class);
+
+ $census = Mockery::mock(CensusInterface::class);
+ $census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
+
+ $column = new CensusColumnReligion($census, '', '');
+
+ $this->assertSame('', $column->generate($individual));
+ }
+}
diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php
new file mode 100644
index 0000000000..6832e974ae
--- /dev/null
+++ b/tests/app/Census/CensusColumnSexMKTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnSexMK
+ */
+class CensusColumnSexMKTest extends \PHPUnit_Framework_TestCase {
+ /**
+ * Delete mock objects
+ */
+ public function tearDown() {
+ Mockery::close();
+ }
+
+ /**
+ * @covers Fisharebest\Webtrees\Census\CensusColumnSexMK
+ * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+ */
+ public function testMale() {
+ $individual = Mockery::mock(Individual::class);
+ $individual->shouldReceive('getSex')->andReturn('M');
+
+ $census = Mockery::mock(CensusInterface::class);
+
+ $column = new CensusColumnSexMK($census, '', '');
+
+ $this->assertSame('M', $column->generate($individual));
+ }
+
+ /**
+ * @covers Fisharebest\Webtrees\Census\CensusColumnSexMK
+ * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+ */
+ public function testFeale() {
+ $individual = Mockery::mock(Individual::class);
+ $individual->shouldReceive('getSex')->andReturn('F');
+
+ $census = Mockery::mock(CensusInterface::class);
+
+ $column = new CensusColumnSexMK($census, '', '');
+
+ $this->assertSame('K', $column->generate($individual));
+ }
+
+ /**
+ * @covers Fisharebest\Webtrees\Census\CensusColumnSexMK
+ * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+ */
+ public function testUnknownSex() {
+ $individual = Mockery::mock(Individual::class);
+ $individual->shouldReceive('getSex')->andReturn('U');
+
+ $census = Mockery::mock(CensusInterface::class);
+
+ $column = new CensusColumnSexMK($census, '', '');
+
+ $this->assertSame('', $column->generate($individual));
+ }
+}
diff --git a/tests/app/Census/CensusOfDenmark1787Test.php b/tests/app/Census/CensusOfDenmark1787Test.php
index fe4515c005..c25ec0de05 100644
--- a/tests/app/Census/CensusOfDenmark1787Test.php
+++ b/tests/app/Census/CensusOfDenmark1787Test.php
@@ -44,21 +44,21 @@ class CensusOfDenmark1787Test extends \PHPUnit_Framework_TestCase {
$this->assertCount(5, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Erhverv', $columns[4]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1801Test.php b/tests/app/Census/CensusOfDenmark1801Test.php
index 898b012798..d597e6a5e8 100644
--- a/tests/app/Census/CensusOfDenmark1801Test.php
+++ b/tests/app/Census/CensusOfDenmark1801Test.php
@@ -44,21 +44,21 @@ class CensusOfDenmark1801Test extends \PHPUnit_Framework_TestCase {
$this->assertCount(5, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Erhverv', $columns[4]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1803Test.php b/tests/app/Census/CensusOfDenmark1803Test.php
index 411bd3bbf7..c3368ab7fa 100644
--- a/tests/app/Census/CensusOfDenmark1803Test.php
+++ b/tests/app/Census/CensusOfDenmark1803Test.php
@@ -44,21 +44,21 @@ class CensusOfDenmark1803Test extends \PHPUnit_Framework_TestCase {
$this->assertCount(5, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Erhverv', $columns[4]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1834Test.php b/tests/app/Census/CensusOfDenmark1834Test.php
index b3e8dbeb59..0b3a5da177 100644
--- a/tests/app/Census/CensusOfDenmark1834Test.php
+++ b/tests/app/Census/CensusOfDenmark1834Test.php
@@ -42,23 +42,20 @@ class CensusOfDenmark1834Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1834;
$columns = $census->columns();
- $this->assertCount(5, $columns);
+ $this->assertCount(4, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Alder', $columns[1]->abbreviation());
+ $this->assertSame('Civilstand', $columns[2]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[3]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1835Test.php b/tests/app/Census/CensusOfDenmark1835Test.php
index 7ad1fa6438..3c022570f8 100644
--- a/tests/app/Census/CensusOfDenmark1835Test.php
+++ b/tests/app/Census/CensusOfDenmark1835Test.php
@@ -42,23 +42,20 @@ class CensusOfDenmark1835Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1835;
$columns = $census->columns();
- $this->assertCount(5, $columns);
+ $this->assertCount(4, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Alder', $columns[1]->abbreviation());
+ $this->assertSame('Civilstand', $columns[2]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[3]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1840Test.php b/tests/app/Census/CensusOfDenmark1840Test.php
index 4951e3eaf7..c29e5e3259 100644
--- a/tests/app/Census/CensusOfDenmark1840Test.php
+++ b/tests/app/Census/CensusOfDenmark1840Test.php
@@ -42,23 +42,20 @@ class CensusOfDenmark1840Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1840;
$columns = $census->columns();
- $this->assertCount(5, $columns);
+ $this->assertCount(4, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Alder', $columns[1]->abbreviation());
+ $this->assertSame('Civilstand', $columns[2]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[3]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1845Test.php b/tests/app/Census/CensusOfDenmark1845Test.php
index 5fa6ed1351..8394c08909 100644
--- a/tests/app/Census/CensusOfDenmark1845Test.php
+++ b/tests/app/Census/CensusOfDenmark1845Test.php
@@ -45,26 +45,26 @@ class CensusOfDenmark1845Test extends \PHPUnit_Framework_TestCase {
$this->assertCount(7, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Alder', $columns[1]->abbreviation());
+ $this->assertSame('Civilstand', $columns[2]->abbreviation());
+ $this->assertSame('Erhverv', $columns[3]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1850Test.php b/tests/app/Census/CensusOfDenmark1850Test.php
index 17cddbd8dc..5313ee2363 100644
--- a/tests/app/Census/CensusOfDenmark1850Test.php
+++ b/tests/app/Census/CensusOfDenmark1850Test.php
@@ -42,29 +42,38 @@ class CensusOfDenmark1850Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1850;
$columns = $census->columns();
- $this->assertCount(7, $columns);
+ $this->assertCount(10, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Alder', $columns[1]->abbreviation());
+ $this->assertSame('Civilstand', $columns[2]->abbreviation());
+ $this->assertSame('Erhverv', $columns[3]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1855Test.php b/tests/app/Census/CensusOfDenmark1855Test.php
index 92155b56cc..4ee6e8e670 100644
--- a/tests/app/Census/CensusOfDenmark1855Test.php
+++ b/tests/app/Census/CensusOfDenmark1855Test.php
@@ -42,32 +42,38 @@ class CensusOfDenmark1855Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1855;
$columns = $census->columns();
- $this->assertCount(8, $columns);
+ $this->assertCount(10, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Alder', $columns[1]->abbreviation());
+ $this->assertSame('Civilstand', $columns[2]->abbreviation());
+ $this->assertSame('Erhverv', $columns[3]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1860Test.php b/tests/app/Census/CensusOfDenmark1860Test.php
index 6a64a2a42e..9a857aef42 100644
--- a/tests/app/Census/CensusOfDenmark1860Test.php
+++ b/tests/app/Census/CensusOfDenmark1860Test.php
@@ -42,32 +42,44 @@ class CensusOfDenmark1860Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1860;
$columns = $census->columns();
- $this->assertCount(8, $columns);
+ $this->assertCount(12, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Alder', $columns[1]->abbreviation());
+ $this->assertSame('Civilstand', $columns[2]->abbreviation());
+ $this->assertSame('Erhverv', $columns[3]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[11]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
+ $this->assertSame('', $columns[11]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1870Test.php b/tests/app/Census/CensusOfDenmark1870Test.php
index e029e9011c..33015233d3 100644
--- a/tests/app/Census/CensusOfDenmark1870Test.php
+++ b/tests/app/Census/CensusOfDenmark1870Test.php
@@ -42,32 +42,50 @@ class CensusOfDenmark1870Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1870;
$columns = $census->columns();
- $this->assertCount(8, $columns);
+ $this->assertCount(14, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
- $this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Køn', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Religion', $columns[4]->abbreviation());
+ $this->assertSame('Erhverv', $columns[5]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[11]->abbreviation());
+ $this->assertSame('', $columns[12]->abbreviation());
+ $this->assertSame('', $columns[13]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
+ $this->assertSame('', $columns[11]->title());
+ $this->assertSame('', $columns[12]->title());
+ $this->assertSame('', $columns[13]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1880Test.php b/tests/app/Census/CensusOfDenmark1880Test.php
index 1995f62d33..bc8e6ca5e8 100644
--- a/tests/app/Census/CensusOfDenmark1880Test.php
+++ b/tests/app/Census/CensusOfDenmark1880Test.php
@@ -42,35 +42,47 @@ class CensusOfDenmark1880Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1880;
$columns = $census->columns();
- $this->assertCount(9, $columns);
+ $this->assertCount(13, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Køn', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Religion', $columns[4]->abbreviation());
+ $this->assertSame('Erhverv', $columns[5]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[11]->abbreviation());
+ $this->assertSame('', $columns[12]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
+ $this->assertSame('', $columns[11]->title());
+ $this->assertSame('', $columns[12]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1885Test.php b/tests/app/Census/CensusOfDenmark1885Test.php
index 92f6e15ee0..a6e53561d9 100644
--- a/tests/app/Census/CensusOfDenmark1885Test.php
+++ b/tests/app/Census/CensusOfDenmark1885Test.php
@@ -42,35 +42,47 @@ class CensusOfDenmark1885Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1885;
$columns = $census->columns();
- $this->assertCount(9, $columns);
+ $this->assertCount(13, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Køn', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Religion', $columns[4]->abbreviation());
+ $this->assertSame('Erhverv', $columns[5]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[11]->abbreviation());
+ $this->assertSame('', $columns[12]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
+ $this->assertSame('', $columns[11]->title());
+ $this->assertSame('', $columns[12]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1890Test.php b/tests/app/Census/CensusOfDenmark1890Test.php
index af7a3f6bfc..033d50b3c0 100644
--- a/tests/app/Census/CensusOfDenmark1890Test.php
+++ b/tests/app/Census/CensusOfDenmark1890Test.php
@@ -42,35 +42,53 @@ class CensusOfDenmark1890Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1890;
$columns = $census->columns();
- $this->assertCount(9, $columns);
+ $this->assertCount(15, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
- $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+ $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Køn', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Trossamfund', $columns[4]->abbreviation());
+ $this->assertSame('Fødested', $columns[5]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[6]->abbreviation());
+ $this->assertSame('Erhverv', $columns[7]->abbreviation());
+ $this->assertSame('Erhvervsstedet', $columns[8]->abbreviation());
+ $this->assertSame('Døvstumme', $columns[9]->abbreviation());
+ $this->assertSame('Døve', $columns[10]->abbreviation());
+ $this->assertSame('Blinde', $columns[11]->abbreviation());
+ $this->assertSame('Idioter', $columns[12]->abbreviation());
+ $this->assertSame('Sindssyge', $columns[13]->abbreviation());
+ $this->assertSame('Anmærkninger', $columns[14]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
+ $this->assertSame('Samtlige Personers fulde Navn.', $columns[0]->title());
+ $this->assertSame('Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).', $columns[1]->title());
+ $this->assertSame('Alder. Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.', $columns[2]->title());
+ $this->assertSame('Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).', $columns[3]->title());
+ $this->assertSame('Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).', $columns[4]->title());
+ $this->assertSame('Fødested, nemlig Sognets og Amtets eller Kjøbstadens (eller Handelpladsens) Navn, og for de i Bilandene Fødte samt for Udlændinge Landet, hvori de ere fødte.', $columns[5]->title());
+ $this->assertSame('Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).', $columns[6]->title());
+ $this->assertSame('Erhverv (Embede, Forretning, Næringsvej og Titel, samt Vedkommendes Stilling som Hovedperson eller Medhjælper, Forvalter, Svend eller Dreng o.s.v.). - Arten af Erhvervet (Gaardejer, Husmand, Grovsmed, Vognfabrikant, Høker o.s.v.). - Under Fattigforsørgelse.', $columns[7]->title());
+ $this->assertSame('Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).', $columns[8]->title());
+ $this->assertSame('Døvstumme.', $columns[9]->title());
+ $this->assertSame('Døve (Hørelson aldeles berøvet).', $columns[10]->title());
+ $this->assertSame('Blinde (Synet aldeles borsvet).', $columns[11]->title());
+ $this->assertSame('Uden Forstandsovner (Idioter).', $columns[12]->title());
+ $this->assertSame('Sindssyge.', $columns[13]->title());
+ $this->assertSame('Anmærkninger.', $columns[14]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1895Test.php b/tests/app/Census/CensusOfDenmark1895Test.php
index f7f7a2e517..6b5a81c551 100644
--- a/tests/app/Census/CensusOfDenmark1895Test.php
+++ b/tests/app/Census/CensusOfDenmark1895Test.php
@@ -42,35 +42,53 @@ class CensusOfDenmark1895Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1895;
$columns = $census->columns();
- $this->assertCount(9, $columns);
+ $this->assertCount(15, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
- $this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+ $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Køn', $columns[1]->abbreviation());
+ $this->assertSame('Alder', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Trossamfund', $columns[4]->abbreviation());
+ $this->assertSame('Fødested', $columns[5]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[6]->abbreviation());
+ $this->assertSame('Erhverv', $columns[7]->abbreviation());
+ $this->assertSame('Erhvervsstedet', $columns[8]->abbreviation());
+ $this->assertSame('Døvstumme', $columns[9]->abbreviation());
+ $this->assertSame('Døve', $columns[10]->abbreviation());
+ $this->assertSame('Blinde', $columns[11]->abbreviation());
+ $this->assertSame('Idioter', $columns[12]->abbreviation());
+ $this->assertSame('Sindssyge', $columns[13]->abbreviation());
+ $this->assertSame('Anmærkninger', $columns[14]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
+ $this->assertSame('Samtlige Personers fulde Navn.', $columns[0]->title());
+ $this->assertSame('Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).', $columns[1]->title());
+ $this->assertSame('Alder. Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.', $columns[2]->title());
+ $this->assertSame('Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).', $columns[3]->title());
+ $this->assertSame('Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).', $columns[4]->title());
+ $this->assertSame('Fødested, nemlig Sognets og Amtets eller Kjøbstadens (eller Handelpladsens) Navn, og for de i Bilandene Fødte samt for Udlændinge Landet, hvori de ere fødte.', $columns[5]->title());
+ $this->assertSame('Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).', $columns[6]->title());
+ $this->assertSame('Erhverv (Embede, Forretning, Næringsvej og Titel, samt Vedkommendes Stilling som Hovedperson eller Medhjælper, Forvalter, Svend eller Dreng o.s.v.). - Arten af Erhvervet (Gaardejer, Husmand, Grovsmed, Vognfabrikant, Høker o.s.v.). - Under Fattigforsørgelse.', $columns[7]->title());
+ $this->assertSame('Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).', $columns[8]->title());
+ $this->assertSame('Døvstumme.', $columns[9]->title());
+ $this->assertSame('Døve (Hørelson aldeles berøvet).', $columns[10]->title());
+ $this->assertSame('Blinde (Synet aldeles borsvet).', $columns[11]->title());
+ $this->assertSame('Uden Forstandsovner (Idioter).', $columns[12]->title());
+ $this->assertSame('Sindssyge.', $columns[13]->title());
+ $this->assertSame('Anmærkninger.', $columns[14]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1901Test.php b/tests/app/Census/CensusOfDenmark1901Test.php
index 276762b4fd..b96d3eca59 100644
--- a/tests/app/Census/CensusOfDenmark1901Test.php
+++ b/tests/app/Census/CensusOfDenmark1901Test.php
@@ -42,38 +42,59 @@ class CensusOfDenmark1901Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1901;
$columns = $census->columns();
- $this->assertCount(10, $columns);
+ $this->assertCount(17, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
- $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
- $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Køn', $columns[1]->abbreviation());
+ $this->assertSame('Fødselsdag', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Trossamfund', $columns[4]->abbreviation());
+ $this->assertSame('Fødested', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[8]->abbreviation());
+ $this->assertSame('Erhverv', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[11]->abbreviation());
+ $this->assertSame('', $columns[12]->abbreviation());
+ $this->assertSame('', $columns[13]->abbreviation());
+ $this->assertSame('', $columns[14]->abbreviation());
+ $this->assertSame('', $columns[15]->abbreviation());
+ $this->assertSame('Anmærkninger', $columns[16]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
+ $this->assertSame('Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“.', $columns[0]->title());
+ $this->assertSame('Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).', $columns[1]->title());
+ $this->assertSame('Føderlsaar og Føderladag.', $columns[2]->title());
+ $this->assertSame('Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).', $columns[3]->title());
+ $this->assertSame('Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „uden for Trossamfund“).', $columns[4]->title());
+ $this->assertSame('Fødested 1) Indenlandsk Fødested: Kebstadens, Handelspladsens eller Sogneta og Amtets Navn (kan Amtet ikke angives, sættes vedkommende Landsdel, f. Eks. Fyn, Jlland osv.), 2) Fedt i Bilandene eller Udlandet: Landets Navn.', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('Stilling i Familien (Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende (naar vedkommende har Skudsmaalsbog), Pensioner, logerende.', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
+ $this->assertSame('', $columns[11]->title());
+ $this->assertSame('', $columns[12]->title());
+ $this->assertSame('', $columns[13]->title());
+ $this->assertSame('', $columns[14]->title());
+ $this->assertSame('', $columns[15]->title());
+ $this->assertSame('Anmærkninger.', $columns[16]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1906Test.php b/tests/app/Census/CensusOfDenmark1906Test.php
index 81fca8dccb..9023f2be56 100644
--- a/tests/app/Census/CensusOfDenmark1906Test.php
+++ b/tests/app/Census/CensusOfDenmark1906Test.php
@@ -42,41 +42,50 @@ class CensusOfDenmark1906Test extends \PHPUnit_Framework_TestCase {
$census = new CensusOfDenmark1906;
$columns = $census->columns();
- $this->assertCount(11, $columns);
+ $this->assertCount(14, $columns);
$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
- $this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
- $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
- $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
- $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
- $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
- $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
+ $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
+ $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]);
+ $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
+ $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
+ $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
- $this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
- $this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+ $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]);
+ $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+ $this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
- $this->assertSame('TBC', $columns[10]->abbreviation());
+ $this->assertSame('Navn', $columns[0]->abbreviation());
+ $this->assertSame('Køn', $columns[1]->abbreviation());
+ $this->assertSame('Fødselsdag', $columns[2]->abbreviation());
+ $this->assertSame('Civilstand', $columns[3]->abbreviation());
+ $this->assertSame('Trossamfund', $columns[4]->abbreviation());
+ $this->assertSame('Fødested', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('Stilling i familien', $columns[8]->abbreviation());
+ $this->assertSame('Erhverv', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[11]->abbreviation());
+ $this->assertSame('', $columns[12]->abbreviation());
+ $this->assertSame('Anmærkninger', $columns[13]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
- $this->assertSame('To be confirmed', $columns[10]->title());
+ $this->assertSame('Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)', $columns[0]->title());
+ $this->assertSame('Kjønnet. Mandkøn (M) eller Kvindekøn (K).', $columns[1]->title());
+ $this->assertSame('Føderlsaar og Føderladag.', $columns[2]->title());
+ $this->assertSame('Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).', $columns[3]->title());
+ $this->assertSame('Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „udenfor Trossamfund“).', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('Stilling i Familien: Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende, Logerende, Pensioner', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
+ $this->assertSame('', $columns[11]->title());
+ $this->assertSame('', $columns[12]->title());
+ $this->assertSame('Anmærkninger.', $columns[13]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1911Test.php b/tests/app/Census/CensusOfDenmark1911Test.php
index e68d560909..4ac6b18375 100644
--- a/tests/app/Census/CensusOfDenmark1911Test.php
+++ b/tests/app/Census/CensusOfDenmark1911Test.php
@@ -54,26 +54,26 @@ class CensusOfDenmark1911Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[0]->abbreviation());
+ $this->assertSame('', $columns[1]->abbreviation());
+ $this->assertSame('', $columns[2]->abbreviation());
+ $this->assertSame('', $columns[3]->abbreviation());
+ $this->assertSame('', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1916Test.php b/tests/app/Census/CensusOfDenmark1916Test.php
index 51c78b16fc..3e7e7e8ddb 100644
--- a/tests/app/Census/CensusOfDenmark1916Test.php
+++ b/tests/app/Census/CensusOfDenmark1916Test.php
@@ -55,28 +55,28 @@ class CensusOfDenmark1916Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
- $this->assertSame('TBC', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[0]->abbreviation());
+ $this->assertSame('', $columns[1]->abbreviation());
+ $this->assertSame('', $columns[2]->abbreviation());
+ $this->assertSame('', $columns[3]->abbreviation());
+ $this->assertSame('', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
- $this->assertSame('To be confirmed', $columns[10]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1921Test.php b/tests/app/Census/CensusOfDenmark1921Test.php
index 660946aaeb..e0993f5bfb 100644
--- a/tests/app/Census/CensusOfDenmark1921Test.php
+++ b/tests/app/Census/CensusOfDenmark1921Test.php
@@ -55,28 +55,28 @@ class CensusOfDenmark1921Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
- $this->assertSame('TBC', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[0]->abbreviation());
+ $this->assertSame('', $columns[1]->abbreviation());
+ $this->assertSame('', $columns[2]->abbreviation());
+ $this->assertSame('', $columns[3]->abbreviation());
+ $this->assertSame('', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
- $this->assertSame('To be confirmed', $columns[10]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1925Test.php b/tests/app/Census/CensusOfDenmark1925Test.php
index 38d1cf41f6..499a23d653 100644
--- a/tests/app/Census/CensusOfDenmark1925Test.php
+++ b/tests/app/Census/CensusOfDenmark1925Test.php
@@ -53,24 +53,24 @@ class CensusOfDenmark1925Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[0]->abbreviation());
+ $this->assertSame('', $columns[1]->abbreviation());
+ $this->assertSame('', $columns[2]->abbreviation());
+ $this->assertSame('', $columns[3]->abbreviation());
+ $this->assertSame('', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1930Test.php b/tests/app/Census/CensusOfDenmark1930Test.php
index b1f178b31d..0c64230f42 100644
--- a/tests/app/Census/CensusOfDenmark1930Test.php
+++ b/tests/app/Census/CensusOfDenmark1930Test.php
@@ -55,28 +55,28 @@ class CensusOfDenmark1930Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
- $this->assertSame('TBC', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[0]->abbreviation());
+ $this->assertSame('', $columns[1]->abbreviation());
+ $this->assertSame('', $columns[2]->abbreviation());
+ $this->assertSame('', $columns[3]->abbreviation());
+ $this->assertSame('', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
- $this->assertSame('To be confirmed', $columns[10]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1940Test.php b/tests/app/Census/CensusOfDenmark1940Test.php
index 3998380e30..38e207018c 100644
--- a/tests/app/Census/CensusOfDenmark1940Test.php
+++ b/tests/app/Census/CensusOfDenmark1940Test.php
@@ -55,28 +55,28 @@ class CensusOfDenmark1940Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
- $this->assertSame('TBC', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[0]->abbreviation());
+ $this->assertSame('', $columns[1]->abbreviation());
+ $this->assertSame('', $columns[2]->abbreviation());
+ $this->assertSame('', $columns[3]->abbreviation());
+ $this->assertSame('', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
- $this->assertSame('To be confirmed', $columns[10]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
}
}
diff --git a/tests/app/Census/CensusOfDenmark1950Test.php b/tests/app/Census/CensusOfDenmark1950Test.php
index cc95696ca9..77067fc49d 100644
--- a/tests/app/Census/CensusOfDenmark1950Test.php
+++ b/tests/app/Census/CensusOfDenmark1950Test.php
@@ -55,28 +55,28 @@ class CensusOfDenmark1950Test extends \PHPUnit_Framework_TestCase {
$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
- $this->assertSame('TBC', $columns[0]->abbreviation());
- $this->assertSame('TBC', $columns[1]->abbreviation());
- $this->assertSame('TBC', $columns[2]->abbreviation());
- $this->assertSame('TBC', $columns[3]->abbreviation());
- $this->assertSame('TBC', $columns[4]->abbreviation());
- $this->assertSame('TBC', $columns[5]->abbreviation());
- $this->assertSame('TBC', $columns[6]->abbreviation());
- $this->assertSame('TBC', $columns[7]->abbreviation());
- $this->assertSame('TBC', $columns[8]->abbreviation());
- $this->assertSame('TBC', $columns[9]->abbreviation());
- $this->assertSame('TBC', $columns[10]->abbreviation());
+ $this->assertSame('', $columns[0]->abbreviation());
+ $this->assertSame('', $columns[1]->abbreviation());
+ $this->assertSame('', $columns[2]->abbreviation());
+ $this->assertSame('', $columns[3]->abbreviation());
+ $this->assertSame('', $columns[4]->abbreviation());
+ $this->assertSame('', $columns[5]->abbreviation());
+ $this->assertSame('', $columns[6]->abbreviation());
+ $this->assertSame('', $columns[7]->abbreviation());
+ $this->assertSame('', $columns[8]->abbreviation());
+ $this->assertSame('', $columns[9]->abbreviation());
+ $this->assertSame('', $columns[10]->abbreviation());
- $this->assertSame('To be confirmed', $columns[0]->title());
- $this->assertSame('To be confirmed', $columns[1]->title());
- $this->assertSame('To be confirmed', $columns[2]->title());
- $this->assertSame('To be confirmed', $columns[3]->title());
- $this->assertSame('To be confirmed', $columns[4]->title());
- $this->assertSame('To be confirmed', $columns[5]->title());
- $this->assertSame('To be confirmed', $columns[6]->title());
- $this->assertSame('To be confirmed', $columns[7]->title());
- $this->assertSame('To be confirmed', $columns[8]->title());
- $this->assertSame('To be confirmed', $columns[9]->title());
- $this->assertSame('To be confirmed', $columns[10]->title());
+ $this->assertSame('', $columns[0]->title());
+ $this->assertSame('', $columns[1]->title());
+ $this->assertSame('', $columns[2]->title());
+ $this->assertSame('', $columns[3]->title());
+ $this->assertSame('', $columns[4]->title());
+ $this->assertSame('', $columns[5]->title());
+ $this->assertSame('', $columns[6]->title());
+ $this->assertSame('', $columns[7]->title());
+ $this->assertSame('', $columns[8]->title());
+ $this->assertSame('', $columns[9]->title());
+ $this->assertSame('', $columns[10]->title());
}
}