Skip to content

Commit cb50c36

Browse files
WalterWoshidWalterWoshid
committed
Refactored tests
1 parent 2c20cef commit cb50c36

34 files changed

+111
-125
lines changed

‎tests/Functional/Cache/CachedFileAndDestructor/CachedFileAndDestructorTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Okapi\CodeTransformer\Core\Cache\CacheStateManager;
66
use Okapi\CodeTransformer\Core\DI;
77
use Okapi\CodeTransformer\Tests\ClassLoaderMockTrait;
8-
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Kernel\CachedFileAndDestructorKernel;
98
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Target\StringClass;
109
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Transformer\StringTransformer;
1110
use Okapi\CodeTransformer\Tests\Util;
@@ -21,7 +20,7 @@ class CachedFileAndDestructorTest extends TestCase
2120
public function testReplaceStringInClass(): void
2221
{
2322
Util::clearCache();
24-
CachedFileAndDestructorKernel::init();
23+
Kernel::init();
2524

2625
$class = StringClass::class;
2726
$this->assertWillBeTransformed($class);
@@ -43,7 +42,7 @@ public function testReplaceStringInClass(): void
4342

4443
public function testCachedReplaceStringClass(): void
4544
{
46-
CachedFileAndDestructorKernel::init();
45+
Kernel::init();
4746

4847
$class = StringClass::class;
4948
$this->assertTransformerLoadedFromCache($class);
@@ -76,7 +75,7 @@ public function testCachedFile(): void
7675
public function testDestructor(): void
7776
{
7877
Util::clearCache();
79-
CachedFileAndDestructorKernel::init();
78+
Kernel::init();
8079

8180
$class = StringClass::class;
8281
$stringClass = new $class();

‎tests/Functional/Cache/CachedFileAndDestructor/Kernel/CachedFileAndDestructorKernel.php renamed to ‎tests/Functional/Cache/CachedFileAndDestructor/Kernel.php

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

3-
namespace Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Kernel;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor;
44

55
use Okapi\CodeTransformer\CodeTransformerKernel;
66
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Transformer\StringTransformer;
77
use Okapi\CodeTransformer\Tests\Util;
88

9-
class CachedFileAndDestructorKernel extends CodeTransformerKernel
9+
class Kernel extends CodeTransformerKernel
1010
{
1111
protected ?string $cacheDir = Util::CACHE_DIR;
1212

‎tests/Functional/Cache/CachedFileAndDestructor/Transformer/StringTransformer.php

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

55
use Microsoft\PhpParser\Node\StringLiteral;
66
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Target\StringClass;
7-
use Okapi\CodeTransformer\Tests\Functional\Transformer\MultipleTransformer\Target\MultipleTransformersClass;
7+
use Okapi\CodeTransformer\Tests\Functional\Transformer\MultipleTransformer\TargetClass;
88
use Okapi\CodeTransformer\Transformer;
99
use Okapi\CodeTransformer\Transformer\Code;
1010

@@ -14,7 +14,7 @@ class StringTransformer extends Transformer
1414

1515
public function getTargetClass(): string|array
1616
{
17-
return [StringClass::class, 'Okapi*Tests*StringClass', MultipleTransformersClass::class];
17+
return [StringClass::class, 'Okapi*Tests*StringClass', TargetClass::class];
1818
}
1919

2020
public function transform(Code $code): void

‎tests/Functional/Cache/DeleteCacheFile/DeleteCacheFileTest.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile;
44

55
use Okapi\CodeTransformer\Tests\ClassLoaderMockTrait;
6-
use Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile\Kernel\DeleteCacheFileKernel;
7-
use Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile\Target\DeleteCacheFileClass;
86
use Okapi\CodeTransformer\Tests\Util;
97
use Okapi\Filesystem\Filesystem;
108
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
@@ -18,9 +16,9 @@ class DeleteCacheFileTest extends TestCase
1816
public function testDeleteCacheFileClass(): void
1917
{
2018
Util::clearCache();
21-
DeleteCacheFileKernel::init();
19+
Kernel::init();
2220

23-
$class = DeleteCacheFileClass::class;
21+
$class = Target::class;
2422
$this->assertWillBeTransformed($class);
2523

2624
$deleteCacheFileClass = new $class();
@@ -32,15 +30,15 @@ public function testDeleteCacheFileClass(): void
3230

3331
public function testCachedDeleteCacheFileClass(): void
3432
{
35-
DeleteCacheFileKernel::init();
33+
Kernel::init();
3634

37-
$cachedFilePath = Util::getTransformedFilePath(DeleteCacheFileClass::class);
35+
$cachedFilePath = Util::getTransformedFilePath(Target::class);
3836

3937
$this->assertFileExists($cachedFilePath);
4038
Filesystem::rm($cachedFilePath);
4139
$this->assertFileDoesNotExist($cachedFilePath);
4240

43-
$class = DeleteCacheFileClass::class;
41+
$class = Target::class;
4442
$this->assertWillBeTransformed($class);
4543

4644
$deleteCacheFileClass = new $class();

‎tests/Functional/Cache/DeleteCacheFile/Kernel/DeleteCacheFileKernel.php renamed to ‎tests/Functional/Cache/DeleteCacheFile/Kernel.php

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

3-
namespace Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile\Kernel;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile;
44

55
use Okapi\CodeTransformer\CodeTransformerKernel;
6-
use Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile\Transformer\DeleteCacheFileTransformer;
76
use Okapi\CodeTransformer\Tests\Util;
87

9-
class DeleteCacheFileKernel extends CodeTransformerKernel
8+
class Kernel extends CodeTransformerKernel
109
{
1110
protected ?string $cacheDir = Util::CACHE_DIR;
1211

1312
protected array $transformers = [
14-
DeleteCacheFileTransformer::class,
13+
Transformer::class,
1514
];
1615
}

‎tests/Functional/Cache/DeleteCacheFile/Target/DeleteCacheFileClass.php renamed to ‎tests/Functional/Cache/DeleteCacheFile/Target.php

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

3-
namespace Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile\Target;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile;
44

5-
class DeleteCacheFileClass
5+
class Target
66
{
77
public function test(): string
88
{

‎tests/Functional/Cache/DeleteCacheFile/Transformer/DeleteCacheFileTransformer.php renamed to ‎tests/Functional/Cache/DeleteCacheFile/Transformer.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?php
22

3-
namespace Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile\Transformer;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile;
44

5-
use Okapi\CodeTransformer\Tests\Functional\Cache\DeleteCacheFile\Target\DeleteCacheFileClass;
6-
use Okapi\CodeTransformer\Transformer;
5+
use Okapi\CodeTransformer\Transformer as TransformerClass;
76
use Okapi\CodeTransformer\Transformer\Code;
87

9-
class DeleteCacheFileTransformer extends Transformer
8+
class Transformer extends TransformerClass
109
{
1110
public function getTargetClass(): string|array
1211
{
13-
return DeleteCacheFileClass::class;
12+
return Target::class;
1413
}
1514

1615
public function transform(Code $code): void

‎tests/Functional/Kernel/AddedTransformer/AddedTransformerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use Okapi\CodeTransformer\Tests\ClassLoaderMockTrait;
66
use Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Kernel\AddedTransformerKernel;
77
use Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Kernel\BeforeAddedTransformerKernel;
8-
use Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Target\AddedTransformerClass;
98
use Okapi\CodeTransformer\Tests\Util;
109
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
1110
use PHPUnit\Framework\TestCase;
@@ -20,7 +19,7 @@ public function testAddedTransformer(): void
2019
Util::clearCache();
2120
BeforeAddedTransformerKernel::init();
2221

23-
$class = AddedTransformerClass::class;
22+
$class = Target::class;
2423
$this->assertWillBeTransformed($class);
2524

2625
$addedTransformerClass = new $class();
@@ -35,7 +34,7 @@ public function testCachedAddedTransformer(): void
3534
{
3635
AddedTransformerKernel::init();
3736

38-
$class = AddedTransformerClass::class;
37+
$class = Target::class;
3938
$this->assertWillBeTransformed($class);
4039

4140
$addedTransformerClass = new $class();

‎tests/Functional/Kernel/AddedTransformer/Target/AddedTransformerClass.php renamed to ‎tests/Functional/Kernel/AddedTransformer/Target.php

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

3-
namespace Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Target;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer;
44

5-
class AddedTransformerClass
5+
class Target
66
{
77
public function test(): string
88
{

‎tests/Functional/Kernel/AddedTransformer/Transformer/AddedTransformer1.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
use Microsoft\PhpParser\Node\Expression\Variable;
77
use Microsoft\PhpParser\Node\Statement\ExpressionStatement;
88
use Microsoft\PhpParser\Node\StringLiteral;
9-
use Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Target\AddedTransformerClass;
9+
use Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Target;
1010
use Okapi\CodeTransformer\Transformer;
1111
use Okapi\CodeTransformer\Transformer\Code;
1212

1313
class AddedTransformer1 extends Transformer
1414
{
1515
public function getTargetClass(): string|array
1616
{
17-
return AddedTransformerClass::class;
17+
return Target::class;
1818
}
1919

2020
public function transform(Code $code): void

‎tests/Functional/Kernel/AddedTransformer/Transformer/AddedTransformer2.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
use Microsoft\PhpParser\Node\Expression\Variable;
77
use Microsoft\PhpParser\Node\Statement\ExpressionStatement;
88
use Microsoft\PhpParser\Node\StringLiteral;
9-
use Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Target\AddedTransformerClass;
9+
use Okapi\CodeTransformer\Tests\Functional\Kernel\AddedTransformer\Target;
1010
use Okapi\CodeTransformer\Transformer;
1111
use Okapi\CodeTransformer\Transformer\Code;
1212

1313
class AddedTransformer2 extends Transformer
1414
{
1515
public function getTargetClass(): string|array
1616
{
17-
return AddedTransformerClass::class;
17+
return Target::class;
1818
}
1919

2020
public function transform(Code $code): void

‎tests/Functional/Kernel/AlreadyInitializedKernel/AlreadyInitializedKernelTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Okapi\CodeTransformer\Tests\Functional\Kernel\AlreadyInitializedKernel;
44

5-
use Okapi\CodeTransformer\Tests\Functional\Kernel\AlreadyInitializedKernel\Kernel\ExceptionOnDoubleInitializationKernel;
65
use Okapi\CodeTransformer\Tests\Stubs\Kernel\EmptyKernel;
76
use Okapi\CodeTransformer\Tests\Util;
87
use Okapi\Singleton\Exceptions\AlreadyInitializedException;
@@ -28,7 +27,7 @@ public function testInitializeKernelTwiceWithExceptionOnDoubleInitializationOpti
2827

2928
$this->expectException(AlreadyInitializedException::class);
3029

31-
ExceptionOnDoubleInitializationKernel::init();
32-
ExceptionOnDoubleInitializationKernel::init();
30+
Kernel::init();
31+
Kernel::init();
3332
}
3433
}

‎tests/Functional/Kernel/AlreadyInitializedKernel/Kernel/ExceptionOnDoubleInitializationKernel.php renamed to ‎tests/Functional/Kernel/AlreadyInitializedKernel/Kernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22
/** @noinspection PhpUnhandledExceptionInspection */
3-
namespace Okapi\CodeTransformer\Tests\Functional\Kernel\AlreadyInitializedKernel\Kernel;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Kernel\AlreadyInitializedKernel;
44

55
use Exception;
66
use Okapi\CodeTransformer\Tests\Stubs\Kernel\EmptyKernel;
77

8-
class ExceptionOnDoubleInitializationKernel extends EmptyKernel
8+
class Kernel extends EmptyKernel
99
{
1010
private int $initCount = 0;
1111

‎tests/Functional/Kernel/CustomDependencyInjectionHandler/CustomDependencyInjectionHandlerTest.php

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

55
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Target\StringClass;
66
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Transformer\StringTransformer;
7-
use Okapi\CodeTransformer\Tests\Functional\Kernel\CustomDependencyInjectionHandler\Kernel\CustomDependencyInjectionKernel;
87
use Okapi\CodeTransformer\Tests\Util;
98
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
109
use PHPUnit\Framework\TestCase;
@@ -18,7 +17,17 @@ class CustomDependencyInjectionHandlerTest extends TestCase
1817
public function testCustomDependencyInjectionHandler(): void
1918
{
2019
Util::clearCache();
21-
CustomDependencyInjectionKernel::init();
20+
21+
ob_start();
22+
23+
Kernel::init();
24+
25+
$output = ob_get_clean();
26+
27+
$this->assertStringContainsString(
28+
'Generating transformer instance: ' . StringTransformer::class,
29+
$output,
30+
);
2231

2332
$class = new StringClass();
2433

‎tests/Functional/Kernel/CustomDependencyInjectionHandler/Kernel/CustomDependencyInjectionKernel.php renamed to ‎tests/Functional/Kernel/CustomDependencyInjectionHandler/Kernel.php

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

3-
namespace Okapi\CodeTransformer\Tests\Functional\Kernel\CustomDependencyInjectionHandler\Kernel;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Kernel\CustomDependencyInjectionHandler;
44

55
use Closure;
66
use Okapi\CodeTransformer\CodeTransformerKernel;
77
use Okapi\CodeTransformer\Tests\Functional\Cache\CachedFileAndDestructor\Transformer\StringTransformer;
88
use Okapi\CodeTransformer\Tests\Util;
99

10-
class CustomDependencyInjectionKernel extends CodeTransformerKernel
10+
class Kernel extends CodeTransformerKernel
1111
{
1212
protected ?string $cacheDir = Util::CACHE_DIR;
1313

‎tests/Functional/Target/ChangedClass/ChangedClassTest.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass;
44

55
use Okapi\CodeTransformer\Tests\ClassLoaderMockTrait;
6-
use Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass\Kernel\ChangedClassKernel;
7-
use Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass\Target\ChangedClass;
86
use Okapi\CodeTransformer\Tests\Util;
97
use Okapi\Filesystem\Filesystem;
108
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
@@ -21,9 +19,9 @@ class ChangedClassTest extends TestCase
2119
public function testChangedClass(): void
2220
{
2321
Util::clearCache();
24-
ChangedClassKernel::init();
22+
Kernel::init();
2523

26-
$class = ChangedClass::class;
24+
$class = Target::class;
2725
$this->assertWillBeTransformed($class);
2826

2927
$changedClass = new $class();
@@ -36,7 +34,7 @@ public function testChangedClass(): void
3634
public function testCachedChangedClass(): void
3735
{
3836
// Change class
39-
$classFilePath = Util::getFilePath(ChangedClass::class);
37+
$classFilePath = Util::getFilePath(Target::class);
4038
$originalClassFileContent = Filesystem::readFile($classFilePath);
4139

4240
$changedFileContent = str_replace(
@@ -50,9 +48,9 @@ public function testCachedChangedClass(): void
5048

5149
$exception = null;
5250
try {
53-
ChangedClassKernel::init();
51+
Kernel::init();
5452

55-
$class = ChangedClass::class;
53+
$class = Target::class;
5654
$this->assertWillBeTransformed($class);
5755

5856
$classInstance = new $class();

‎tests/Functional/Target/ChangedClass/Kernel/ChangedClassKernel.php renamed to ‎tests/Functional/Target/ChangedClass/Kernel.php

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

3-
namespace Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass\Kernel;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass;
44

55
use Okapi\CodeTransformer\CodeTransformerKernel;
6-
use Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass\Transformer\ChangedClassTransformer;
76
use Okapi\CodeTransformer\Tests\Util;
87

9-
class ChangedClassKernel extends CodeTransformerKernel
8+
class Kernel extends CodeTransformerKernel
109
{
1110
protected ?string $cacheDir = Util::CACHE_DIR;
1211

1312
protected array $transformers = [
14-
ChangedClassTransformer::class,
13+
Transformer::class,
1514
];
1615
}

‎tests/Functional/Target/ChangedClass/Target/ChangedClass.php renamed to ‎tests/Functional/Target/ChangedClass/Target.php

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

3-
namespace Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass\Target;
3+
namespace Okapi\CodeTransformer\Tests\Functional\Target\ChangedClass;
44

5-
class ChangedClass
5+
class Target
66
{
77
public function test(): string
88
{

0 commit comments

Comments
 (0)