From a384f0535a6ec9f52eaf199eea4e48faa1f5aaaf Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Tue, 10 Jan 2023 09:57:21 +0100
Subject: [PATCH 1/2] Reorganize

---
 .../with-test-suffix}/AbstractTest.php         |  0
 ...dingAbstractTestClassWithTestSuffixTest.php | 14 ++++++++++++++
 .../without-test-suffix}/AbstractTestCase.php  |  0
 ...gAbstractTestClassWithoutTestSuffixTest.php | 14 ++++++++++++++
 .../abstract-test-class-with-test-suffix.phpt  |  6 +++---
 ...bstract-test-class-without-test-suffix.phpt |  6 +++---
 ...g-abstract-test-class-with-test-suffix.phpt | 18 ++++++++++++++++++
 ...bstract-test-class-without-test-suffix.phpt | 18 ++++++++++++++++++
 .../generic/concrete-test-class.phpt           | 18 ------------------
 9 files changed, 70 insertions(+), 24 deletions(-)
 rename tests/_files/{ => abstract/with-test-suffix}/AbstractTest.php (100%)
 create mode 100644 tests/_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php
 rename tests/_files/{ => abstract/without-test-suffix}/AbstractTestCase.php (100%)
 create mode 100644 tests/_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php
 rename tests/end-to-end/generic/{ => abstract-test-class}/abstract-test-class-with-test-suffix.phpt (73%)
 rename tests/end-to-end/generic/{ => abstract-test-class}/abstract-test-class-without-test-suffix.phpt (72%)
 create mode 100644 tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-with-test-suffix.phpt
 create mode 100644 tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-without-test-suffix.phpt
 delete mode 100644 tests/end-to-end/generic/concrete-test-class.phpt

diff --git a/tests/_files/AbstractTest.php b/tests/_files/abstract/with-test-suffix/AbstractTest.php
similarity index 100%
rename from tests/_files/AbstractTest.php
rename to tests/_files/abstract/with-test-suffix/AbstractTest.php
diff --git a/tests/_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php b/tests/_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php
new file mode 100644
index 00000000000..f7cf69ad134
--- /dev/null
+++ b/tests/_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture;
+
+final class ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest extends AbstractTest
+{
+}
diff --git a/tests/_files/AbstractTestCase.php b/tests/_files/abstract/without-test-suffix/AbstractTestCase.php
similarity index 100%
rename from tests/_files/AbstractTestCase.php
rename to tests/_files/abstract/without-test-suffix/AbstractTestCase.php
diff --git a/tests/_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php b/tests/_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php
new file mode 100644
index 00000000000..528d679382f
--- /dev/null
+++ b/tests/_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture;
+
+final class ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest extends AbstractTestCase
+{
+}
diff --git a/tests/end-to-end/generic/abstract-test-class-with-test-suffix.phpt b/tests/end-to-end/generic/abstract-test-class/abstract-test-class-with-test-suffix.phpt
similarity index 73%
rename from tests/end-to-end/generic/abstract-test-class-with-test-suffix.phpt
rename to tests/end-to-end/generic/abstract-test-class/abstract-test-class-with-test-suffix.phpt
index 9793d48958f..10f15d46e35 100644
--- a/tests/end-to-end/generic/abstract-test-class-with-test-suffix.phpt
+++ b/tests/end-to-end/generic/abstract-test-class/abstract-test-class-with-test-suffix.phpt
@@ -1,13 +1,13 @@
 --TEST--
-phpunit ../../_files/AbstractTest.php
+phpunit ../../../_files/abstract/with-test-suffix/AbstractTest.php
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = 'AbstractTest';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/AbstractTest.php';
+$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/with-test-suffix/AbstractTest.php';
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/generic/abstract-test-class-without-test-suffix.phpt b/tests/end-to-end/generic/abstract-test-class/abstract-test-class-without-test-suffix.phpt
similarity index 72%
rename from tests/end-to-end/generic/abstract-test-class-without-test-suffix.phpt
rename to tests/end-to-end/generic/abstract-test-class/abstract-test-class-without-test-suffix.phpt
index f8fb98d865b..883e31a8d7b 100644
--- a/tests/end-to-end/generic/abstract-test-class-without-test-suffix.phpt
+++ b/tests/end-to-end/generic/abstract-test-class/abstract-test-class-without-test-suffix.phpt
@@ -1,13 +1,13 @@
 --TEST--
-phpunit ../../_files/AbstractTestCase.php
+phpunit ../../../_files/abstract/without-test-suffix/AbstractTestCase.php
 --FILE--
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = 'AbstractTestCase';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/AbstractTestCase.php';
+$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/without-test-suffix/AbstractTestCase.php';
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
diff --git a/tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-with-test-suffix.phpt b/tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-with-test-suffix.phpt
new file mode 100644
index 00000000000..8d100d67d2c
--- /dev/null
+++ b/tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-with-test-suffix.phpt
@@ -0,0 +1,18 @@
+--TEST--
+phpunit ../../../_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php';
+
+require_once __DIR__ . '/../../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-without-test-suffix.phpt b/tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-without-test-suffix.phpt
new file mode 100644
index 00000000000..699cf7b79d2
--- /dev/null
+++ b/tests/end-to-end/generic/abstract-test-class/concrete-test-class-extending-abstract-test-class-without-test-suffix.phpt
@@ -0,0 +1,18 @@
+--TEST--
+phpunit ../../../_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php';
+
+require_once __DIR__ . '/../../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/generic/concrete-test-class.phpt b/tests/end-to-end/generic/concrete-test-class.phpt
deleted file mode 100644
index 2e2536502a3..00000000000
--- a/tests/end-to-end/generic/concrete-test-class.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-phpunit ../../_files/ConcreteTest.php
---FILE--
-<?php declare(strict_types=1);
-$_SERVER['argv'][] = '--do-not-cache-result';
-$_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = __DIR__ . '/../../_files/ConcreteTest.php';
-
-require_once __DIR__ . '/../../bootstrap.php';
-PHPUnit\TextUI\Command::main();
---EXPECTF--
-PHPUnit %s by Sebastian Bergmann and contributors.
-
-..                                                                  2 / 2 (100%)
-
-Time: %s, Memory: %s
-
-OK (2 tests, 2 assertions)

From c0a8cb85666cf8c07b5bd1340cf284d9c0668dae Mon Sep 17 00:00:00 2001
From: Sebastian Bergmann <sb@sebastian-bergmann.de>
Date: Tue, 10 Jan 2023 10:02:18 +0100
Subject: [PATCH 2/2] Add tests for directory with abstract and concrete test
 class (with and without Test suffix in abstract test class name)

---
 ...d-abstract-test-class-with-test-suffix.phpt | 18 ++++++++++++++++++
 ...bstract-test-class-without-test-suffix.phpt | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-with-test-suffix.phpt
 create mode 100644 tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-without-test-suffix.phpt

diff --git a/tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-with-test-suffix.phpt b/tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-with-test-suffix.phpt
new file mode 100644
index 00000000000..35bf84383fb
--- /dev/null
+++ b/tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-with-test-suffix.phpt
@@ -0,0 +1,18 @@
+--TEST--
+phpunit ../../../_files/abstract/with-test-suffix
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/with-test-suffix';
+
+require_once __DIR__ . '/../../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)
diff --git a/tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-without-test-suffix.phpt b/tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-without-test-suffix.phpt
new file mode 100644
index 00000000000..466fbaed7ff
--- /dev/null
+++ b/tests/end-to-end/generic/abstract-test-class/directory-with-concrete-test-class-and-abstract-test-class-without-test-suffix.phpt
@@ -0,0 +1,18 @@
+--TEST--
+phpunit ../../../_files/abstract/without-test-suffix
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/without-test-suffix';
+
+require_once __DIR__ . '/../../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)