From 69b7ac6c8b2500a6e8bfd6ba36f0a45166621728 Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Thu, 31 Dec 2020 19:53:17 +0000
Subject: [PATCH] Rework final unit test to remove image inspector

---
 .../Libraries/Cms/Image/ImageFilterTest.php   |  8 ----
 tests/Unit/Libraries/Cms/Image/ImageTest.php  | 13 +++---
 .../Cms/Image/stubs/ImageFilterInspector.php  | 30 -------------
 .../Cms/Image/stubs/ImageInspector.php        | 45 -------------------
 4 files changed, 6 insertions(+), 90 deletions(-)
 delete mode 100644 tests/Unit/Libraries/Cms/Image/stubs/ImageFilterInspector.php
 delete mode 100644 tests/Unit/Libraries/Cms/Image/stubs/ImageInspector.php

diff --git a/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php b/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
index da41a967b6008..5e76d8803db70 100644
--- a/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
+++ b/tests/Unit/Libraries/Cms/Image/ImageFilterTest.php
@@ -7,7 +7,6 @@
 namespace Joomla\Tests\Unit\Libraries\Cms\Image;
 
 use Joomla\CMS\Image\Filter\Brightness as FilterBrightness;
-use Joomla\CMS\Image\Filter\Inspector as FilterInspector;
 use Joomla\Test\TestHelper;
 use Joomla\Tests\Unit\UnitTestCase;
 
@@ -18,11 +17,6 @@
  */
 class ImageFilterTest extends UnitTestCase
 {
-	/**
-	 * @var  FilterInspector  The object to test.
-	 */
-	protected $instance;
-
 	/**
 	 * Setup for testing.
 	 *
@@ -39,8 +33,6 @@ protected function setUp(): void
 		{
 			$this->markTestSkipped('No GD support so skipping Image tests.');
 		}
-
-		$this->instance = new FilterInspector(imagecreate(10, 10));
 	}
 
 	/**
diff --git a/tests/Unit/Libraries/Cms/Image/ImageTest.php b/tests/Unit/Libraries/Cms/Image/ImageTest.php
index 523c3db67185c..0941a2a93d189 100644
--- a/tests/Unit/Libraries/Cms/Image/ImageTest.php
+++ b/tests/Unit/Libraries/Cms/Image/ImageTest.php
@@ -6,9 +6,6 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Image;
 
-require_once __DIR__ . '/stubs/ImageInspector.php';
-require_once __DIR__ . '/stubs/ImageFilterInspector.php';
-
 use Joomla\CMS\Image\Image;
 use Joomla\Test\TestHelper;
 use Joomla\Tests\Unit\UnitTestCase;
@@ -1245,12 +1242,14 @@ public function testFilter()
 		$mockFilter->expects($this->once())
 			->method('execute');
 
-		// Create a new ImageInspector object.
-		$image = new ImageInspector($handle);
-		$image->mockFilter = $mockFilter;
+		// Create a new Image mock
+		$mockImage = $this->getMockForAbstractClass('\\Joomla\\CMS\\Image\\Image', [$handle], 'ImageMock', true, false, true, ['getFilterInstance']);
+		$mockImage->expects($this->once())
+			->method('getFilterInstance')
+			->willReturn($mockFilter);
 
 		// Execute the filter.
-		$image->filter('mock');
+		$mockImage->filter('mock');
 	}
 
 	/**
diff --git a/tests/Unit/Libraries/Cms/Image/stubs/ImageFilterInspector.php b/tests/Unit/Libraries/Cms/Image/stubs/ImageFilterInspector.php
deleted file mode 100644
index b434e6c94415f..0000000000000
--- a/tests/Unit/Libraries/Cms/Image/stubs/ImageFilterInspector.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
- */
-
-namespace Joomla\CMS\Image\Filter;
-
-use Joomla\CMS\Image\ImageFilter;
-
-/**
- * Image Filter class inspector for testing purposes.
- *
- * @since  4.0.0
- */
-class Inspector extends ImageFilter
-{
-	/**
-	 * Method to apply a filter to an image resource.
-	 *
-	 * @param   array  $options  An array of options for the filter.
-	 *
-	 * @return  void
-	 *
-	 * @since   4.0.0
-	 */
-	public function execute(array $options = array())
-	{
-	}
-}
diff --git a/tests/Unit/Libraries/Cms/Image/stubs/ImageInspector.php b/tests/Unit/Libraries/Cms/Image/stubs/ImageInspector.php
deleted file mode 100644
index 855224225adc9..0000000000000
--- a/tests/Unit/Libraries/Cms/Image/stubs/ImageInspector.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * @copyright  (C) 2020 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE
- */
-
-namespace Joomla\Tests\Unit\Libraries\Cms\Image;
-
-use Joomla\CMS\Image\Image as Image;
-
-/**
- * Inspector for the Image class.
- *
- * @since  4.0.0
- */
-class ImageInspector extends Image
-{
-	/**
-	 * @var    ImageFilter  A mock image filter to be returned from getFilterInstance().
-	 * @since  4.0.0
-	 */
-	public $mockFilter;
-
-	/**
-	 * Allows public access to protected method.
-	 *
-	 * @param   string  $type  The image filter type to get.
-	 *
-	 * @return  ImageFilter
-	 *
-	 * @since   4.0.0
-	 * @throws  \RuntimeException
-	 */
-	public function getFilterInstance($type)
-	{
-		if ($this->mockFilter)
-		{
-			return $this->mockFilter;
-		}
-		else
-		{
-			return parent::getFilterInstance($type);
-		}
-	}
-}