Skip to content

Commit 396900f

Browse files
committed
test: Normalize test names to be executed
1 parent 935dafc commit 396900f

File tree

19 files changed

+33
-97
lines changed

19 files changed

+33
-97
lines changed

tests/ORM/Functional/Driver/Common/Integration/Case428/TestCase.php renamed to tests/ORM/Functional/Driver/Common/Integration/Case428/CaseTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\IntegrationTestTrait;
1111
use Cycle\ORM\Tests\Traits\TableTrait;
1212

13-
abstract class TestCase extends BaseTest
13+
abstract class CaseTest extends BaseTest
1414
{
1515
use IntegrationTestTrait;
1616
use TableTrait;

tests/ORM/Functional/Driver/Common/Integration/CaseTemplate/TestCase.php renamed to tests/ORM/Functional/Driver/Common/Integration/CaseTemplate/CaseTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\IntegrationTestTrait;
1010
use Cycle\ORM\Tests\Traits\TableTrait;
1111

12-
abstract class TestCase extends BaseTest
12+
abstract class CaseTest extends BaseTest
1313
{
1414
use IntegrationTestTrait;
1515
use TableTrait;

tests/ORM/Functional/Driver/Common/Integration/Issue356/TestCase.php renamed to tests/ORM/Functional/Driver/Common/Integration/Issue356/CaseTest.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/**
1414
* Test belongs to morphed loader
1515
*/
16-
abstract class TestCase extends BaseTest
16+
abstract class CaseTest extends BaseTest
1717
{
1818
use IntegrationTestTrait;
1919
use TableTrait;
@@ -69,7 +69,9 @@ public function testSelectAll(): void
6969
$this->captureReadQueries();
7070
foreach ($logs as $log) {
7171
$this->assertInstanceOf(Entity\LogRecord::class, $log);
72-
self::assertInstanceOf(Entity\Actor::class, $log->actor);
72+
\in_array($log->id, [9], true)
73+
? self::assertNull($log->actor)
74+
: self::assertInstanceOf(Entity\Actor::class, $log->actor);
7375
}
7476
$this->assertNumReads(0);
7577
}
@@ -93,7 +95,9 @@ public function testUpdateMany(): void
9395
// Check result
9496
$this->captureReadQueries();
9597
foreach ($logs as $log) {
96-
$this->assertInstanceOf(Entity\Actor::class, $log->actor);
98+
\in_array($log->id, [9], true)
99+
? self::assertNull($log->actor)
100+
: self::assertInstanceOf(Entity\Actor::class, $log->actor);
97101
}
98102
$this->assertNumReads(0);
99103
}

tests/ORM/Functional/Driver/MySQL/Integration/Case428/TestCase.php renamed to tests/ORM/Functional/Driver/MySQL/Integration/Case428/CaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
namespace Cycle\ORM\Tests\Functional\Driver\MySQL\Integration\Case428;
66

77
// phpcs:ignore
8-
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Case428\TestCase as CommonClass;
8+
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Case428\CaseTest as CommonClass;
99

1010
/**
1111
* @group driver
1212
* @group driver-mysql
1313
*/
14-
class TestCase extends CommonClass
14+
class CaseTest extends CommonClass
1515
{
1616
public const DRIVER = 'mysql';
1717
}

tests/ORM/Functional/Driver/MySQL/Integration/CaseTemplate/TestCase.php renamed to tests/ORM/Functional/Driver/MySQL/Integration/CaseTemplate/CaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
namespace Cycle\ORM\Tests\Functional\Driver\MySQL\Integration\CaseTemplate;
66

77
// phpcs:ignore
8-
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\CaseTemplate\TestCase as CommonClass;
8+
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\CaseTemplate\CaseTest as CommonClass;
99

1010
/**
1111
* @group driver
1212
* @group driver-mysql
1313
*/
14-
class TestCase extends CommonClass
14+
class CaseTest extends CommonClass
1515
{
1616
public const DRIVER = 'mysql';
1717
}

tests/ORM/Functional/Driver/MySQL/Integration/Issue356/TestCase.php renamed to tests/ORM/Functional/Driver/MySQL/Integration/Issue356/CaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
namespace Cycle\ORM\Tests\Functional\Driver\MySQL\Integration\Issue356;
66

77
// phpcs:ignore
8-
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Issue356\TestCase as CommonClass;
8+
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Issue356\CaseTest as CommonClass;
99

1010
/**
1111
* @group driver
1212
* @group driver-mysql
1313
*/
14-
class TestCase extends CommonClass
14+
class CaseTest extends CommonClass
1515
{
1616
public const DRIVER = 'mysql';
1717
}

tests/ORM/Functional/Driver/MySQL/Integration/Issue482/AbstractTestCase.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

tests/ORM/Functional/Driver/Postgres/Integration/Case428/TestCase.php renamed to tests/ORM/Functional/Driver/Postgres/Integration/Case428/CaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
namespace Cycle\ORM\Tests\Functional\Driver\Postgres\Integration\Case428;
66

77
// phpcs:ignore
8-
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Case428\TestCase as CommonClass;
8+
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Case428\CaseTest as CommonClass;
99

1010
/**
1111
* @group driver
1212
* @group driver-postgres
1313
*/
14-
class TestCase extends CommonClass
14+
class CaseTest extends CommonClass
1515
{
1616
public const DRIVER = 'postgres';
1717
}

tests/ORM/Functional/Driver/Postgres/Integration/CaseTemplate/TestCase.php renamed to tests/ORM/Functional/Driver/Postgres/Integration/CaseTemplate/CaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
namespace Cycle\ORM\Tests\Functional\Driver\Postgres\Integration\CaseTemplate;
66

77
// phpcs:ignore
8-
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\CaseTemplate\TestCase as CommonClass;
8+
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\CaseTemplate\CaseTest as CommonClass;
99

1010
/**
1111
* @group driver
1212
* @group driver-postgres
1313
*/
14-
class TestCase extends CommonClass
14+
class CaseTest extends CommonClass
1515
{
1616
public const DRIVER = 'postgres';
1717
}

tests/ORM/Functional/Driver/Postgres/Integration/Issue356/TestCase.php renamed to tests/ORM/Functional/Driver/Postgres/Integration/Issue356/CaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
namespace Cycle\ORM\Tests\Functional\Driver\Postgres\Integration\Issue356;
66

77
// phpcs:ignore
8-
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Issue356\TestCase as CommonClass;
8+
use Cycle\ORM\Tests\Functional\Driver\Common\Integration\Issue356\CaseTest as CommonClass;
99

1010
/**
1111
* @group driver
1212
* @group driver-postgres
1313
*/
14-
class TestCase extends CommonClass
14+
class CaseTest extends CommonClass
1515
{
1616
public const DRIVER = 'postgres';
1717
}

0 commit comments

Comments
 (0)