Skip to content

Commit 71853f0

Browse files
ipfipf
committed
Fix most Tests
1 parent d20d792 commit 71853f0

25 files changed

+186
-262
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
env:
14-
- { php: 8.0 }
15-
- { php: 8.1 }
16-
- { php: 8.2 }
14+
- { php: 8.3 }
1715

1816
env: ${{ matrix.env }}
1917

@@ -47,4 +45,4 @@ jobs:
4745
- name: Run Unit Tests
4846
run: |
4947
echo "Running unit tests with $(which php)";
50-
.Build/bin/phpunit --colors -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit/;
48+
TYPO3_CONTEXT=Testing .Build/bin/phpunit --colors -c .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTests.xml Tests/Unit/;

‎Tests/Unit/Controller/SearchControllerTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
*
2727
* This copyright notice MUST APPEAR in all copies of the script!
2828
* ************************************************************* */
29-
use Nimut\TestingFramework\TestCase\UnitTestCase;
29+
3030
use Subugoe\Find\Controller\SearchController;
31+
use TYPO3\TestingFramework\Core\BaseTestCase;
3132

3233
/**
3334
* Tests for search controller.
3435
*/
35-
class SearchControllerTest extends UnitTestCase
36+
class SearchControllerTest extends BaseTestCase
3637
{
3738
/**
3839
* @var SearchController

‎Tests/Unit/Service/SolrServiceProviderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Subugoe\Tests\Unit\Service;
3+
namespace Subugoe\Find\Tests\Unit\Service;
44

55
/* * *************************************************************
66
* Copyright notice
@@ -27,13 +27,13 @@
2727
* This copyright notice MUST APPEAR in all copies of the script!
2828
* ************************************************************* */
2929

30-
use Nimut\TestingFramework\TestCase\UnitTestCase;
3130
use Subugoe\Find\Service\SolrServiceProvider;
31+
use TYPO3\TestingFramework\Core\BaseTestCase;
3232

3333
/**
3434
* Solr ServiceProvider Test.
3535
*/
36-
class SolrServiceProviderTest extends UnitTestCase
36+
class SolrServiceProviderTest extends BaseTestCase
3737
{
3838
/**
3939
* @var SolrServiceProvider

‎Tests/Unit/Utility/UpgradeUtilityTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace Subugoe\Find\Tests\Unit\Utility;
66

7-
use PHPUnit\Framework\TestCase;
87
use Subugoe\Find\Utility\UpgradeUtility;
8+
use TYPO3\TestingFramework\Core\BaseTestCase;
99

10-
class UpgradeUtilityTest extends TestCase
10+
class UpgradeUtilityTest extends BaseTestCase
1111
{
1212
public function settingsProvider(): array
1313
{

‎Tests/Unit/ViewHelpers/Data/ArrayFirstViewHelperTest.php

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@
2626
* This copyright notice MUST APPEAR in all copies of the script!
2727
* ************************************************************* */
2828

29-
use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
29+
use PHPUnit\Framework\Attributes\Test;
3030
use Subugoe\Find\ViewHelpers\Data\ArrayFirstViewHelper;
31+
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
32+
use TYPO3\TestingFramework\Core\BaseTestCase;
3133

3234
/**
3335
* Test for ArrayFirst ViewHelper.
3436
*/
35-
class ArrayFirstViewHelperTest extends ViewHelperBaseTestcase
37+
class ArrayFirstViewHelperTest extends BaseTestCase
3638
{
3739
/**
3840
* @var ArrayFirstViewHelper
@@ -42,15 +44,11 @@ class ArrayFirstViewHelperTest extends ViewHelperBaseTestcase
4244
protected function setUp(): void
4345
{
4446
parent::setUp();
45-
$this->fixture = $this->getMockBuilder(ArrayFirstViewHelper::class)
46-
->onlyMethods(['renderChildren'])
47-
->getMock();
48-
$this->injectDependenciesIntoViewHelper($this->fixture);
47+
$this->fixture = $this->getAccessibleMock(ArrayFirstViewHelper::class, null);
48+
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
4949
}
5050

51-
/**
52-
* @test
53-
*/
51+
#[Test]
5452
public function isFirstElementOfAnArrayReturned(): void
5553
{
5654
$array = ['hrdr', 'horus', 'behedeti'];
@@ -59,20 +57,7 @@ public function isFirstElementOfAnArrayReturned(): void
5957
self::assertSame('hrdr', $this->fixture->initializeArgumentsAndRender());
6058
}
6159

62-
/**
63-
* @test
64-
*/
65-
public function nullIsReturnedOnNullValue(): void
66-
{
67-
$array = null;
68-
$this->fixture->setArguments(['array' => $array]);
69-
70-
self::assertNull($this->fixture->initializeArgumentsAndRender());
71-
}
72-
73-
/**
74-
* @test
75-
*/
60+
#[Test]
7661
public function nullIsReturnedWhenPassingAStringInsteadOfAnArray(): void
7762
{
7863
$array = 'hrdr';
@@ -81,9 +66,7 @@ public function nullIsReturnedWhenPassingAStringInsteadOfAnArray(): void
8166
self::assertNull($this->fixture->initializeArgumentsAndRender());
8267
}
8368

84-
/**
85-
* @test
86-
*/
69+
#[Test]
8770
public function theValueFromTheFirstArrayIsReturnedOnMultidimensionalArrays()
8871
{
8972
$array = ['hrdr' => 'horus', 'behedeti'];
@@ -92,9 +75,7 @@ public function theValueFromTheFirstArrayIsReturnedOnMultidimensionalArrays()
9275
self::assertSame('horus', $this->fixture->initializeArgumentsAndRender());
9376
}
9477

95-
/**
96-
* @test
97-
*/
78+
#[Test]
9879
public function anEmptyArrayCausesSomething(): void
9980
{
10081
$array = [];

‎Tests/Unit/ViewHelpers/Data/IsArrayViewHelperTest.php

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@
2626
* This copyright notice MUST APPEAR in all copies of the script!
2727
* ************************************************************* */
2828

29-
use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
29+
use PHPUnit\Framework\Attributes\Test;
3030
use Subugoe\Find\ViewHelpers\Data\IsArrayViewHelper;
31+
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
32+
use TYPO3\TestingFramework\Core\BaseTestCase;
3133

3234
/**
3335
* Test for IsArray ViewHelper.
3436
*/
35-
class IsArrayViewHelperTest extends ViewHelperBaseTestcase
37+
class IsArrayViewHelperTest extends BaseTestCase
3638
{
3739
/**
3840
* @var IsArrayViewHelper
@@ -42,55 +44,36 @@ class IsArrayViewHelperTest extends ViewHelperBaseTestcase
4244
protected function setUp(): void
4345
{
4446
parent::setUp();
45-
$this->fixture = $this->getMockBuilder(IsArrayViewHelper::class)
46-
->onlyMethods(['renderChildren'])
47-
->getMock();
48-
$this->injectDependenciesIntoViewHelper($this->fixture);
47+
$this->fixture = $this->getAccessibleMock(IsArrayViewHelper::class, null);
48+
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
4949
}
5050

51-
/**
52-
* @test
53-
*/
51+
#[Test]
5452
public function arrayIsInterpretedAsArray(): void
5553
{
5654
$this->fixture->setArguments(['subject' => ['hrdr']]);
5755
self::assertTrue($this->fixture->initializeArgumentsAndRender());
5856
}
5957

60-
/**
61-
* @test
62-
*/
58+
#[Test]
6359
public function intIsNotInterpretedAsArray(): void
6460
{
6561
$this->fixture->setArguments(['subject' => 667]);
6662
self::assertFalse($this->fixture->initializeArgumentsAndRender());
6763
}
6864

69-
/**
70-
* @test
71-
*/
65+
#[Test]
7266
public function objectsAreNotInterpretedAsArray(): void
7367
{
7468
$this->expectException(\InvalidArgumentException::class);
7569
$this->fixture->setArguments(['subject' => $this->fixture]);
7670
self::assertFalse($this->fixture->initializeArgumentsAndRender());
7771
}
7872

79-
/**
80-
* @test
81-
*/
73+
#[Test]
8274
public function stringsAreNotInterpretedAsArray(): void
8375
{
8476
$this->fixture->setArguments(['subject' => 'hrdr']);
8577
self::assertFalse($this->fixture->initializeArgumentsAndRender());
8678
}
87-
88-
/**
89-
* @test
90-
*/
91-
public function nullIsNotInterpretedAsArray(): void
92-
{
93-
$this->fixture->setArguments(['subject' => null]);
94-
self::assertFalse($this->fixture->initializeArgumentsAndRender());
95-
}
9679
}

‎Tests/Unit/ViewHelpers/Data/NewArrayViewHelperTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626
* This copyright notice MUST APPEAR in all copies of the script!
2727
* ************************************************************* */
2828

29-
use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
3029
use PHPUnit\Framework\MockObject\MockObject;
3130
use Subugoe\Find\ViewHelpers\Data\NewArrayViewHelper;
31+
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
32+
use TYPO3\TestingFramework\Core\BaseTestCase;
3233

3334
/**
3435
* Test for NewArray ViewHelper.
3536
*/
36-
class NewArrayViewHelperTest extends ViewHelperBaseTestcase
37+
class NewArrayViewHelperTest extends BaseTestCase
3738
{
3839
/**
3940
* @var NewArrayViewHelper
@@ -43,10 +44,8 @@ class NewArrayViewHelperTest extends ViewHelperBaseTestcase
4344
protected function setUp(): void
4445
{
4546
parent::setUp();
46-
$this->fixture = $this->getMockBuilder(NewArrayViewHelper::class)
47-
->onlyMethods(['renderChildren'])
48-
->getMock();
49-
$this->injectDependenciesIntoViewHelper($this->fixture);
47+
$this->fixture = $this->getAccessibleMock(NewArrayViewHelper::class, null);
48+
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
5049
}
5150

5251
/**

‎Tests/Unit/ViewHelpers/Data/SplitViewHelperTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
* This copyright notice MUST APPEAR in all copies of the script!
2727
* ************************************************************* */
2828

29-
use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
3029
use Subugoe\Find\ViewHelpers\Data\SplitViewHelper;
30+
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
31+
use TYPO3\TestingFramework\Core\BaseTestCase;
3132

3233
/**
3334
* Test for Split ViewHelper.
3435
*/
35-
class SplitViewHelperTest extends ViewHelperBaseTestcase
36+
class SplitViewHelperTest extends BaseTestCase
3637
{
3738
/**
3839
* @var SplitViewHelper
@@ -43,10 +44,8 @@ protected function setUp(): void
4344
{
4445
parent::setUp();
4546

46-
$this->fixture = $this->getMockBuilder(SplitViewHelper::class)
47-
->addMethods(['dummy'])
48-
->getMock();
49-
$this->injectDependenciesIntoViewHelper($this->fixture);
47+
$this->fixture = $this->getAccessibleMock(SplitViewHelper::class, null);
48+
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
5049
}
5150

5251
/**

‎Tests/Unit/ViewHelpers/Data/TransposeViewHelperTest.php

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

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

5-
use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
5+
use PHPUnit\Framework\Attributes\Test;
66
use PHPUnit\Framework\MockObject\MockObject;
77
use Subugoe\Find\ViewHelpers\Data\TransposeViewHelper;
8+
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
9+
use TYPO3\TestingFramework\Core\BaseTestCase;
810
use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider;
911

1012
/**
1113
* Test for Transpose ViewHelper.
1214
*/
13-
class TransposeViewHelperTest extends ViewHelperBaseTestcase
15+
class TransposeViewHelperTest extends BaseTestCase
1416
{
1517
public TransposeViewHelper|MockObject $fixture;
1618

@@ -22,15 +24,11 @@ class TransposeViewHelperTest extends ViewHelperBaseTestcase
2224
protected function setUp(): void
2325
{
2426
parent::setUp();
25-
$this->fixture = $this->getMockBuilder(TransposeViewHelper::class)
26-
->setMethods(['render'])
27-
->getMock();
28-
$this->injectDependenciesIntoViewHelper($this->fixture);
27+
$this->fixture = $this->getAccessibleMock(TransposeViewHelper::class, null);
28+
$this->fixture->setRenderingContext($this->getMockBuilder(RenderingContext::class)->disableOriginalConstructor()->getMock());
2929
}
3030

31-
/**
32-
* @test
33-
*/
31+
#[Test]
3432
public function arrayIsTransposed(): void
3533
{
3634
$arguments = [

‎Tests/Unit/ViewHelpers/Data/ValueForKeyViewHelperTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626
* This copyright notice MUST APPEAR in all copies of the script!
2727
* ************************************************************* */
2828

29-
use Nimut\TestingFramework\TestCase\ViewHelperBaseTestcase;
3029
use Subugoe\Find\Tests\Unit\ViewHelpers\MockRenderingContextTrait;
3130
use Subugoe\Find\ViewHelpers\Data\ValueForKeyViewHelper;
31+
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
32+
use TYPO3\TestingFramework\Core\BaseTestCase;
3233

3334
/**
3435
* Test for ValueForKey ViewHelper.
3536
*/
36-
class ValueForKeyViewHelperTest extends ViewHelperBaseTestcase
37+
class ValueForKeyViewHelperTest extends BaseTestCase
3738
{
3839
use MockRenderingContextTrait;
3940

@@ -46,10 +47,8 @@ protected function setUp(): void
4647
{
4748
parent::setUp();
4849

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

5554
/**

0 commit comments

Comments
 (0)