Tests cleaned up

Author: lloc

includes/MslsBlock.php

@@ -4,7 +4,6 @@
 
 class MslsBlock {
 
-
 	protected MslsOptions $options;
 
 	public function __construct( MslsOptions $options ) {

tests/phpunit/Component/Icon/TestIconPng.php

@@ -6,7 +6,7 @@
 use lloc\Msls\Component\Icon\IconPng;
 use lloc\MslsTests\MslsUnitTestCase;
 
-class TestIconPng extends MslsUnitTestCase {
+final class TestIconPng extends MslsUnitTestCase {
 
 	public function test_get(): void {
 		Functions\when( 'plugin_dir_path' )->justReturn( dirname( __DIR__, 4 ) . '/' );

tests/phpunit/Component/Icon/TestIconSvg.php

@@ -6,7 +6,7 @@
 use lloc\Msls\Component\Icon\IconSvg;
 use lloc\MslsTests\MslsUnitTestCase;
 
-class TestIconSvg extends MslsUnitTestCase {
+final class TestIconSvg extends MslsUnitTestCase {
 
 	public function test_get(): void {
 		Functions\when( 'plugin_dir_path' )->justReturn( dirname( __DIR__, 4 ) . '/' );

tests/phpunit/ContentImport/Importers/Attachments/TestLinking.php

@@ -7,7 +7,7 @@
 use lloc\Msls\ContentImport\Importers\Attachments\Linking;
 use lloc\MslsTests\MslsUnitTestCase;
 
-class TestLinking extends MslsUnitTestCase {
+final class TestLinking extends MslsUnitTestCase {
 
 	public function testImport(): void {
 		$coordinates = \Mockery::mock( ImportCoordinates::class );

tests/phpunit/ContentImport/Importers/PostFields/TestDuplicating.php

@@ -7,7 +7,7 @@
 use lloc\Msls\ContentImport\Importers\PostFields\Duplicating;
 use lloc\MslsTests\MslsUnitTestCase;
 
-class TestDuplicating extends MslsUnitTestCase {
+final class TestDuplicating extends MslsUnitTestCase {
 
 	public function testImport(): void {
 		Functions\expect( 'wp_insert_post' )->once();

tests/phpunit/ContentImport/Importers/PostMeta/TestDuplicating.php

@@ -9,7 +9,7 @@
 
 use function Brain\Monkey\Functions;
 
-class TestDuplicating extends MslsUnitTestCase {
+final class TestDuplicating extends MslsUnitTestCase {
 
 	public function testImport(): void {
 		Functions\expect( 'switch_to_blog' )->twice();

tests/phpunit/ContentImport/Importers/TestAttachmentsImporters.php

@@ -5,7 +5,7 @@
 use lloc\Msls\ContentImport\Importers\AttachmentsImporters;
 use lloc\MslsTests\MslsUnitTestCase;
 
-class TestAttachmentsImporters extends MslsUnitTestCase {
+final class TestAttachmentsImporters extends MslsUnitTestCase {
 
 
 	public function testDetails(): void {

tests/phpunit/ContentImport/Importers/TestBaseImporter.php

@@ -8,34 +8,44 @@
 use lloc\Msls\ContentImport\Relations;
 use lloc\MslsTests\MslsUnitTestCase;
 
-class TestBaseImporter extends MslsUnitTestCase {
-
-	public function setUp(): void {
-		parent::setUp();
+final class TestBaseImporter extends MslsUnitTestCase {
 
+	private function BaseImporterFactory(): BaseImporter {
 		$import_coordinates = \Mockery::mock( ImportCoordinates::class );
-		$this->test         = new BaseImporter( $import_coordinates );
+
+		return new BaseImporter( $import_coordinates );
 	}
 
 	public function testImport(): void {
-		$this->assertEquals( array(), $this->test->import( array() ) );
+		$test = $this->BaseImporterFactory();
+
+		$this->assertEquals( array(), $test->import( array() ) );
 	}
 
 	public function testSetImportCoordinates(): void {
 		$import_coordinates = \Mockery::mock( ImportCoordinates::class );
 
 		$this->expectNotToPerformAssertions();
-		$this->test->set_import_coordinates( $import_coordinates );
+
+		$test = $this->BaseImporterFactory();
+
+		$test->set_import_coordinates( $import_coordinates );
 	}
 
 	public function testGetLogger(): void {
-		$this->assertInstanceOf( ImportLogger::class, $this->test->get_logger() );
+		$test = $this->BaseImporterFactory();
+
+		$this->assertInstanceOf( ImportLogger::class, $test->get_logger() );
 	}
 	public function testGetRelations(): void {
-		$this->assertInstanceOf( Relations::class, $this->test->get_relations() );
+		$test = $this->BaseImporterFactory();
+
+		$this->assertInstanceOf( Relations::class, $test->get_relations() );
 	}
 
 	public function testInfo(): void {
-		$this->assertInstanceOf( \stdClass::class, $this->test->info() );
+		$test = $this->BaseImporterFactory();
+
+		$this->assertInstanceOf( \stdClass::class, $test->info() );
 	}
 }

tests/phpunit/ContentImport/Importers/TestImportersBaseFactory.php

@@ -7,7 +7,7 @@
 use lloc\MslsTests\MslsUnitTestCase;
 use Mockery\Mock;
 
-class TestImportersBaseFactory extends MslsUnitTestCase {
+final class TestImportersBaseFactory extends MslsUnitTestCase {
 
 	public function testMake(): void {
 		$coordinates = \Mockery::mock( ImportCoordinates::class );

tests/phpunit/ContentImport/Importers/TestMap.php

@@ -6,7 +6,7 @@
 use lloc\Msls\ContentImport\Importers\Map;
 use lloc\MslsTests\MslsUnitTestCase;
 
-class TestMap extends MslsUnitTestCase {
+final class TestMap extends MslsUnitTestCase {
 
 	public function testMake(): void {
 		$coordinates = \Mockery::mock( ImportCoordinates::class );