Skip to content

Commit

Permalink
Fix most Tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ipf committed Jan 6, 2025
1 parent d20d792 commit 71853f0
Show file tree
Hide file tree
Showing 25 changed files with 186 additions and 262 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ jobs:
fail-fast: false
matrix:
env:
- { php: 8.0 }
- { php: 8.1 }
- { php: 8.2 }
- { php: 8.3 }

env: ${{ matrix.env }}

Expand Down Expand Up @@ -47,4 +45,4 @@ jobs:
- name: Run Unit Tests
run: |
echo "Running unit tests with $(which php)";
.Build/bin/phpunit --colors -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit/;
TYPO3_CONTEXT=Testing .Build/bin/phpunit --colors -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests.xml Tests/Unit/;
5 changes: 3 additions & 2 deletions Tests/Unit/Controller/SearchControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
*
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */
use Nimut\TestingFramework\TestCase\UnitTestCase;

use Subugoe\Find\Controller\SearchController;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Tests for search controller.
*/
class SearchControllerTest extends UnitTestCase
class SearchControllerTest extends BaseTestCase
{
/**
* @var SearchController
Expand Down
6 changes: 3 additions & 3 deletions Tests/Unit/Service/SolrServiceProviderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Subugoe\Tests\Unit\Service;
namespace Subugoe\Find\Tests\Unit\Service;

/* * *************************************************************
* Copyright notice
Expand All @@ -27,13 +27,13 @@
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */

use Nimut\TestingFramework\TestCase\UnitTestCase;
use Subugoe\Find\Service\SolrServiceProvider;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Solr ServiceProvider Test.
*/
class SolrServiceProviderTest extends UnitTestCase
class SolrServiceProviderTest extends BaseTestCase
{
/**
* @var SolrServiceProvider
Expand Down
4 changes: 2 additions & 2 deletions Tests/Unit/Utility/UpgradeUtilityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

namespace Subugoe\Find\Tests\Unit\Utility;

use PHPUnit\Framework\TestCase;
use Subugoe\Find\Utility\UpgradeUtility;
use TYPO3\TestingFramework\Core\BaseTestCase;

class UpgradeUtilityTest extends TestCase
class UpgradeUtilityTest extends BaseTestCase
{
public function settingsProvider(): array
{
Expand Down
39 changes: 10 additions & 29 deletions Tests/Unit/ViewHelpers/Data/ArrayFirstViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */

use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
use PHPUnit\Framework\Attributes\Test;
use Subugoe\Find\ViewHelpers\Data\ArrayFirstViewHelper;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Test for ArrayFirst ViewHelper.
*/
class ArrayFirstViewHelperTest extends ViewHelperBaseTestcase
class ArrayFirstViewHelperTest extends BaseTestCase
{
/**
* @var ArrayFirstViewHelper
Expand All @@ -42,15 +44,11 @@ class ArrayFirstViewHelperTest extends ViewHelperBaseTestcase
protected function setUp(): void
{
parent::setUp();
$this->fixture = $this->getMockBuilder(ArrayFirstViewHelper::class)
->onlyMethods(['renderChildren'])
->getMock();
$this->injectDependenciesIntoViewHelper($this->fixture);
$this->fixture = $this->getAccessibleMock(ArrayFirstViewHelper::class, null);
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
}

/**
* @test
*/
#[Test]
public function isFirstElementOfAnArrayReturned(): void
{
$array = ['hrdr', 'horus', 'behedeti'];
Expand All @@ -59,20 +57,7 @@ public function isFirstElementOfAnArrayReturned(): void
self::assertSame('hrdr', $this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
public function nullIsReturnedOnNullValue(): void
{
$array = null;
$this->fixture->setArguments(['array' => $array]);

self::assertNull($this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
#[Test]
public function nullIsReturnedWhenPassingAStringInsteadOfAnArray(): void
{
$array = 'hrdr';
Expand All @@ -81,9 +66,7 @@ public function nullIsReturnedWhenPassingAStringInsteadOfAnArray(): void
self::assertNull($this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
#[Test]
public function theValueFromTheFirstArrayIsReturnedOnMultidimensionalArrays()
{
$array = ['hrdr' => 'horus', 'behedeti'];
Expand All @@ -92,9 +75,7 @@ public function theValueFromTheFirstArrayIsReturnedOnMultidimensionalArrays()
self::assertSame('horus', $this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
#[Test]
public function anEmptyArrayCausesSomething(): void
{
$array = [];
Expand Down
37 changes: 10 additions & 27 deletions Tests/Unit/ViewHelpers/Data/IsArrayViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */

use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
use PHPUnit\Framework\Attributes\Test;
use Subugoe\Find\ViewHelpers\Data\IsArrayViewHelper;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Test for IsArray ViewHelper.
*/
class IsArrayViewHelperTest extends ViewHelperBaseTestcase
class IsArrayViewHelperTest extends BaseTestCase
{
/**
* @var IsArrayViewHelper
Expand All @@ -42,55 +44,36 @@ class IsArrayViewHelperTest extends ViewHelperBaseTestcase
protected function setUp(): void
{
parent::setUp();
$this->fixture = $this->getMockBuilder(IsArrayViewHelper::class)
->onlyMethods(['renderChildren'])
->getMock();
$this->injectDependenciesIntoViewHelper($this->fixture);
$this->fixture = $this->getAccessibleMock(IsArrayViewHelper::class, null);
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
}

/**
* @test
*/
#[Test]
public function arrayIsInterpretedAsArray(): void
{
$this->fixture->setArguments(['subject' => ['hrdr']]);
self::assertTrue($this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
#[Test]
public function intIsNotInterpretedAsArray(): void
{
$this->fixture->setArguments(['subject' => 667]);
self::assertFalse($this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
#[Test]
public function objectsAreNotInterpretedAsArray(): void
{
$this->expectException(\InvalidArgumentException::class);
$this->fixture->setArguments(['subject' => $this->fixture]);
self::assertFalse($this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
#[Test]
public function stringsAreNotInterpretedAsArray(): void
{
$this->fixture->setArguments(['subject' => 'hrdr']);
self::assertFalse($this->fixture->initializeArgumentsAndRender());
}

/**
* @test
*/
public function nullIsNotInterpretedAsArray(): void
{
$this->fixture->setArguments(['subject' => null]);
self::assertFalse($this->fixture->initializeArgumentsAndRender());
}
}
11 changes: 5 additions & 6 deletions Tests/Unit/ViewHelpers/Data/NewArrayViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */

use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
use PHPUnit\Framework\MockObject\MockObject;
use Subugoe\Find\ViewHelpers\Data\NewArrayViewHelper;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Test for NewArray ViewHelper.
*/
class NewArrayViewHelperTest extends ViewHelperBaseTestcase
class NewArrayViewHelperTest extends BaseTestCase
{
/**
* @var NewArrayViewHelper
Expand All @@ -43,10 +44,8 @@ class NewArrayViewHelperTest extends ViewHelperBaseTestcase
protected function setUp(): void
{
parent::setUp();
$this->fixture = $this->getMockBuilder(NewArrayViewHelper::class)
->onlyMethods(['renderChildren'])
->getMock();
$this->injectDependenciesIntoViewHelper($this->fixture);
$this->fixture = $this->getAccessibleMock(NewArrayViewHelper::class, null);
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
}

/**
Expand Down
11 changes: 5 additions & 6 deletions Tests/Unit/ViewHelpers/Data/SplitViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */

use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
use Subugoe\Find\ViewHelpers\Data\SplitViewHelper;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Test for Split ViewHelper.
*/
class SplitViewHelperTest extends ViewHelperBaseTestcase
class SplitViewHelperTest extends BaseTestCase
{
/**
* @var SplitViewHelper
Expand All @@ -43,10 +44,8 @@ protected function setUp(): void
{
parent::setUp();

$this->fixture = $this->getMockBuilder(SplitViewHelper::class)
->addMethods(['dummy'])
->getMock();
$this->injectDependenciesIntoViewHelper($this->fixture);
$this->fixture = $this->getAccessibleMock(SplitViewHelper::class, null);
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
}

/**
Expand Down
16 changes: 7 additions & 9 deletions Tests/Unit/ViewHelpers/Data/TransposeViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

namespace Subugoe\Find\Tests\Unit\ViewHelpers\Data;

use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\MockObject\MockObject;
use Subugoe\Find\ViewHelpers\Data\TransposeViewHelper;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\TestingFramework\Core\BaseTestCase;
use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider;

/**
* Test for Transpose ViewHelper.
*/
class TransposeViewHelperTest extends ViewHelperBaseTestcase
class TransposeViewHelperTest extends BaseTestCase
{
public TransposeViewHelper|MockObject $fixture;

Expand All @@ -22,15 +24,11 @@ class TransposeViewHelperTest extends ViewHelperBaseTestcase
protected function setUp(): void
{
parent::setUp();
$this->fixture = $this->getMockBuilder(TransposeViewHelper::class)
->setMethods(['render'])
->getMock();
$this->injectDependenciesIntoViewHelper($this->fixture);
$this->fixture = $this->getAccessibleMock(TransposeViewHelper::class, null);
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
}

/**
* @test
*/
#[Test]
public function arrayIsTransposed(): void
{
$arguments = [
Expand Down
11 changes: 5 additions & 6 deletions Tests/Unit/ViewHelpers/Data/ValueForKeyViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */

use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
use Subugoe\Find\Tests\Unit\ViewHelpers\MockRenderingContextTrait;
use Subugoe\Find\ViewHelpers\Data\ValueForKeyViewHelper;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Test for ValueForKey ViewHelper.
*/
class ValueForKeyViewHelperTest extends ViewHelperBaseTestcase
class ValueForKeyViewHelperTest extends BaseTestCase
{
use MockRenderingContextTrait;

Expand All @@ -46,10 +47,8 @@ protected function setUp(): void
{
parent::setUp();

$this->fixture = $this->getMockBuilder(ValueForKeyViewHelper::class)->onlyMethods(['renderChildren'])->getMock();
$this->injectDependenciesIntoViewHelper($this->fixture);
$this->createRenderingContextMock();
$this->inject($this->fixture, 'renderingContext', $this->renderingContextMock);
$this->fixture = $this->getAccessibleMock(ValueForKeyViewHelper::class, null);
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
}

/**
Expand Down
9 changes: 5 additions & 4 deletions Tests/Unit/ViewHelpers/Find/FacetIsActiveViewHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
* This copyright notice MUST APPEAR in all copies of the script!
* ************************************************************* */

use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
use Subugoe\Find\ViewHelpers\Find\FacetIsActiveViewHelper;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\TestingFramework\Core\BaseTestCase;

/**
* Test for FacetIsActive ViewHelper.
*/
class FacetIsActiveViewHelperTest extends ViewHelperBaseTestcase
class FacetIsActiveViewHelperTest extends BaseTestCase
{
/**
* @var FacetIsActiveViewHelper
Expand All @@ -42,8 +43,8 @@ class FacetIsActiveViewHelperTest extends ViewHelperBaseTestcase
protected function setUp(): void
{
parent::setUp();
$this->fixture = $this->getAccessibleMock(FacetIsActiveViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->fixture);
$this->fixture = $this->getAccessibleMock(FacetIsActiveViewHelper::class, null);
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
}

/**
Expand Down
Loading

0 comments on commit 71853f0

Please sign in to comment.