First draft of Danish census

1 files changed, 33 insertions, 24 deletions

diff --git a/tests/app/Census/CensusOfDenmark1921Test.php b/tests/app/Census/CensusOfDenmark1921Test.php
index 63f7089da8..3151aea858 100644
--- a/tests/app/Census/CensusOfDenmark1921Test.php
+++ b/tests/app/Census/CensusOfDenmark1921Test.php
@@ -42,41 +42,50 @@ class CensusOfDenmark1921Test extends \PHPUnit_Framework_TestCase {
 		$census  = new CensusOfDenmark1921;
 		$columns = $census->columns();
 
-		$this->assertCount(11, $columns);
+		$this->assertCount(14, $columns);
 		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
-		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
-		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
-		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
-		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
-		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
-		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonth', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthYear', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $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\CensusColumnNull', $columns[9]);
-		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
 
-		$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('Navn', $columns[0]->abbreviation());
+		$this->assertSame('Køn', $columns[1]->abbreviation());
+		$this->assertSame('Fødselsdag', $columns[2]->abbreviation());
+		$this->assertSame('Fødselsaar', $columns[3]->abbreviation());
+		$this->assertSame('Civilstand', $columns[4]->abbreviation());
+		$this->assertSame('Fødested', $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('Trossamfund', $columns[8]->abbreviation());
+		$this->assertSame('Stilling i familien', $columns[9]->abbreviation());
+		$this->assertSame('Erhverv', $columns[10]->abbreviation());
+		$this->assertSame('', $columns[11]->abbreviation());
+		$this->assertSame('', $columns[12]->abbreviation());
+		$this->assertSame('Anmærkninger', $columns[13]->abbreviation());
 
-		$this->assertSame('', $columns[0]->title());
-		$this->assertSame('', $columns[1]->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('', $columns[2]->title());
 		$this->assertSame('', $columns[3]->title());
-		$this->assertSame('', $columns[4]->title());
+		$this->assertSame('Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).', $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('Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „udenfor Trossamfund“).', $columns[8]->title());
+		$this->assertSame('Stilling i Familien: Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende, Logerende, Pensioner', $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());
 	}
 }