From 3cfcc809af53e831fa6cafac7b274a2cb407db6e Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Wed, 9 Oct 2019 14:00:47 +0100 Subject: Working on routing; Code cleanup --- tests/app/Census/CensusOfScotland1891Test.php | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'tests/app/Census/CensusOfScotland1891Test.php') diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php index a75b88cd50..2715515b84 100644 --- a/tests/app/Census/CensusOfScotland1891Test.php +++ b/tests/app/Census/CensusOfScotland1891Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1891 */ -class CensusOfScotland1891Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1891Test extends TestCase { /** * Test the census place and date @@ -52,18 +54,18 @@ class CensusOfScotland1891Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(12, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); -- cgit v1.3