1 files changed, 59 insertions, 41 deletions
diff --git a/tests/app/Census/CensusOfCzechRepublic1921Test.php b/tests/app/Census/CensusOfCzechRepublic1921Test.php
index a8530beb7e..441a9ffee7 100644
--- a/tests/app/Census/CensusOfCzechRepublic1921Test.php
+++ b/tests/app/Census/CensusOfCzechRepublic1921Test.php
@@ -54,50 +54,68 @@ class CensusOfCzechRepublic1921Test extends TestCase
         $census  = new CensusOfCzechRepublic1921();
         $columns = $census->columns();
 
-        self::assertCount(14, $columns);
-        self::assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-        self::assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-        self::assertInstanceOf(CensusColumnSexMZ::class, $columns[2]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[3]);
-        self::assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[4]);
-        self::assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[6]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[7]);
-        self::assertInstanceOf(CensusColumnReligion::class, $columns[8]);
+        self::assertCount(20, $columns);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[0]);
+        self::assertInstanceOf(CensusColumnSurname::class, $columns[1]);
+        self::assertInstanceOf(CensusColumnGivenNames::class, $columns[2]);
+        self::assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
+        self::assertInstanceOf(CensusColumnSexMZ::class, $columns[4]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[5]);
+        self::assertInstanceOf(CensusColumnBirthDayDotMonthYear::class, $columns[6]);
+        self::assertInstanceOf(CensusColumnBirthPlace::class, $columns[7]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[8]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[9]);
-        self::assertInstanceOf(CensusColumnOccupation::class, $columns[10]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[10]);
+        self::assertInstanceOf(CensusColumnReligion::class, $columns[11]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[12]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[13]);
+        self::assertInstanceOf(CensusColumnOccupation::class, $columns[13]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[14]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[15]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[16]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[17]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[18]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[19]);
 
-        self::assertSame('Jméno', $columns[0]->abbreviation());
-        self::assertSame('Vztah', $columns[1]->abbreviation());
-        self::assertSame('Pohlaví', $columns[2]->abbreviation());
-        self::assertSame('Stav', $columns[3]->abbreviation());
-        self::assertSame('Narození', $columns[4]->abbreviation());
-        self::assertSame('Místo', $columns[5]->abbreviation());
-        self::assertSame('Přísluší', $columns[6]->abbreviation());
-        self::assertSame('Národnost', $columns[7]->abbreviation());
-        self::assertSame('Vyznání', $columns[8]->abbreviation());
-        self::assertSame('Gramotnost', $columns[9]->abbreviation());
-        self::assertSame('Povolání', $columns[10]->abbreviation());
-        self::assertSame('Postavení', $columns[11]->abbreviation());
-        self::assertSame('Podnik', $columns[12]->abbreviation());
-        self::assertSame('', $columns[13]->abbreviation());
+        self::assertSame('Ř.č.', $columns[0]->abbreviation());
+        self::assertSame('Příjmení', $columns[1]->abbreviation());
+        self::assertSame('Jméno', $columns[2]->abbreviation());
+        self::assertSame('Vztah', $columns[3]->abbreviation());
+        self::assertSame('Pohlaví', $columns[4]->abbreviation());
+        self::assertSame('Stav', $columns[5]->abbreviation());
+        self::assertSame('Narození', $columns[6]->abbreviation());
+        self::assertSame('Rodiště', $columns[7]->abbreviation());
+        self::assertSame('Bydlí od', $columns[8]->abbreviation());
+        self::assertSame('Přísluší', $columns[9]->abbreviation());
+        self::assertSame('Národnost', $columns[10]->abbreviation());
+        self::assertSame('Vyznání', $columns[11]->abbreviation());
+        self::assertSame('Gramotnost', $columns[12]->abbreviation());
+        self::assertSame('Povolání', $columns[13]->abbreviation());
+        self::assertSame('Postavení', $columns[14]->abbreviation());
+        self::assertSame('Podnik', $columns[15]->abbreviation());
+        self::assertSame('Měl povolání 1914', $columns[16]->abbreviation());
+        self::assertSame('Povolání 1914', $columns[17]->abbreviation());
+        self::assertSame('Postavení 1914', $columns[18]->abbreviation());
+        self::assertSame('Poznámka', $columns[19]->abbreviation());
 
-        self::assertSame('', $columns[0]->title());
-        self::assertSame('', $columns[1]->title());
-        self::assertSame('', $columns[2]->title());
-        self::assertSame('Rodinný stav', $columns[3]->title());
-        self::assertSame('Datum narození', $columns[4]->title());
-        self::assertSame('Místo narození', $columns[5]->title());
-        self::assertSame('Domovské právo', $columns[6]->title());
-        self::assertSame('Mateřský jazyk', $columns[7]->title());
-        self::assertSame('', $columns[8]->title());
-        self::assertSame('Znalost čtení a psaní', $columns[9]->title());
-        self::assertSame('', $columns[10]->title());
-        self::assertSame('Postavení v zaměstnání', $columns[11]->title());
-        self::assertSame('', $columns[12]->title());
-        self::assertSame('', $columns[13]->title());
+        self::assertSame('Řadové číslo', $columns[0]->title());
+        self::assertSame('jméno rodinné', $columns[1]->title());
+        self::assertSame('Jméno (křestni)', $columns[2]->title());
+        self::assertSame('', $columns[3]->title());
+        self::assertSame('', $columns[4]->title());
+        self::assertSame('Rodinný stav', $columns[5]->title());
+        self::assertSame('Datum narození', $columns[6]->title());
+        self::assertSame('Rodná obec, Soudní okres, Země', $columns[7]->title());
+        self::assertSame('Od kdy bydlí zapsána osoba v obci?', $columns[8]->title());
+        self::assertSame('Domovské právo', $columns[9]->title());
+        self::assertSame('Mateřský jazyk', $columns[10]->title());
+        self::assertSame('', $columns[11]->title());
+        self::assertSame('Znalost čtení a psaní', $columns[12]->title());
+        self::assertSame('Druh povolání', $columns[13]->title());
+        self::assertSame('Postavení v zaměstnání', $columns[14]->title());
+        self::assertSame('', $columns[15]->title());
+        self::assertSame('', $columns[16]->title());
+        self::assertSame('Druh povolání dne 16. července 1914', $columns[17]->title());
+        self::assertSame('Postavení v zaměstnání dne 16. července 1914', $columns[18]->title());
+        self::assertSame('', $columns[19]->title());
     }
 }