From: Joe Nahmias <jello@debian.org>
Date: Sun, 14 Sep 2025 23:08:41 -0400
Subject: fix loading of abstract TestCases

---
 .../Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php        | 4 +---
 .../acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php | 3 +--
 .../Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php          | 4 +---
 .../Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php          | 4 +---
 tests/bootstrap.php                                                   | 4 ++++
 tests/unit/Swift/Mime/AttachmentTest.php                              | 2 +-
 tests/unit/Swift/Mime/MimePartTest.php                                | 2 +-
 tests/unit/Swift/Mime/SimpleMimeEntityTest.php                        | 2 +-
 tests/unit/Swift/Transport/AbstractSmtpEventSupportTestCase.php       | 4 +---
 tests/unit/Swift/Transport/EsmtpTransportTest.php                     | 2 +-
 tests/unit/Swift/Transport/SendmailTransportTest.php                  | 2 +-
 11 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php b/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
index 345df7c..be867bb 100644
--- a/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
+++ b/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
-
-class Swift_Transport_StreamBuffer_BasicSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+class Swift_Transport_StreamBuffer_BasicSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php b/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
index d5916f3..f625912 100644
--- a/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
+++ b/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
@@ -1,9 +1,8 @@
 <?php
 
-require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
 use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 
-class Swift_Transport_StreamBuffer_ProcessAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+class Swift_Transport_StreamBuffer_ProcessAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php b/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
index f740c87..ae74b52 100644
--- a/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
+++ b/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
-
-class Swift_Transport_StreamBuffer_SslSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+class Swift_Transport_StreamBuffer_SslSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php b/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
index bbc9f7a..65b4274 100644
--- a/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
+++ b/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
-
-class Swift_Transport_StreamBuffer_TlsSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+class Swift_Transport_StreamBuffer_TlsSocketAcceptanceTest extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d7e5ad1..65e9b89 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -19,3 +19,7 @@ require_once __DIR__.'/StreamCollector.php';
 require_once __DIR__.'/IdenticalBinaryConstraint.php';
 require_once __DIR__.'/SwiftMailerTestCase.php';
 require_once __DIR__.'/SwiftMailerSmokeTestCase.php';
+require_once __DIR__.'/unit/Swift/Mime/AbstractMimeEntityTestCase.php';
+require_once __DIR__.'/unit/Swift/Transport/AbstractSmtpTestCase.php';
+require_once __DIR__.'/unit/Swift/Transport/AbstractSmtpEventSupportTestCase.php';
+require_once __DIR__.'/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTestCase.php';
diff --git a/tests/unit/Swift/Mime/AttachmentTest.php b/tests/unit/Swift/Mime/AttachmentTest.php
index da7f824..34b12d1 100644
--- a/tests/unit/Swift/Mime/AttachmentTest.php
+++ b/tests/unit/Swift/Mime/AttachmentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
+class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTestCase
 {
     public function testNestingLevelIsAttachment()
     {
diff --git a/tests/unit/Swift/Mime/MimePartTest.php b/tests/unit/Swift/Mime/MimePartTest.php
index 028e5f4..808b1fb 100644
--- a/tests/unit/Swift/Mime/MimePartTest.php
+++ b/tests/unit/Swift/Mime/MimePartTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
+class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTestCase
 {
     public function testNestingLevelIsSubpart()
     {
diff --git a/tests/unit/Swift/Mime/SimpleMimeEntityTest.php b/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
index 60ae231..34f85e0 100644
--- a/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
+++ b/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Swift_Mime_SimpleMimeEntityTest extends Swift_Mime_AbstractMimeEntityTest
+class Swift_Mime_SimpleMimeEntityTest extends Swift_Mime_AbstractMimeEntityTestCase
 {
     protected function createEntity($headerFactory, $encoder, $cache)
     {
diff --git a/tests/unit/Swift/Transport/AbstractSmtpEventSupportTestCase.php b/tests/unit/Swift/Transport/AbstractSmtpEventSupportTestCase.php
index 384cc01..2e2098c 100644
--- a/tests/unit/Swift/Transport/AbstractSmtpEventSupportTestCase.php
+++ b/tests/unit/Swift/Transport/AbstractSmtpEventSupportTestCase.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once __DIR__.'/AbstractSmtpTest.php';
-
-abstract class Swift_Transport_AbstractSmtpEventSupportTestCase extends Swift_Transport_AbstractSmtpTest
+abstract class Swift_Transport_AbstractSmtpEventSupportTestCase extends Swift_Transport_AbstractSmtpTestCase
 {
     public function testRegisterPluginLoadsPluginInEventDispatcher()
     {
diff --git a/tests/unit/Swift/Transport/EsmtpTransportTest.php b/tests/unit/Swift/Transport/EsmtpTransportTest.php
index 508fce6..bbd9131 100644
--- a/tests/unit/Swift/Transport/EsmtpTransportTest.php
+++ b/tests/unit/Swift/Transport/EsmtpTransportTest.php
@@ -2,7 +2,7 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 
-class Swift_Transport_EsmtpTransportTest extends Swift_Transport_AbstractSmtpEventSupportTest
+class Swift_Transport_EsmtpTransportTest extends Swift_Transport_AbstractSmtpEventSupportTestCase
 {
     protected function getTransport($buf, $dispatcher = null, $addressEncoder = null)
     {
diff --git a/tests/unit/Swift/Transport/SendmailTransportTest.php b/tests/unit/Swift/Transport/SendmailTransportTest.php
index fe40d6c..21dc958 100644
--- a/tests/unit/Swift/Transport/SendmailTransportTest.php
+++ b/tests/unit/Swift/Transport/SendmailTransportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtpEventSupportTest
+class Swift_Transport_SendmailTransportTest extends Swift_Transport_AbstractSmtpEventSupportTestCase
 {
     protected function getTransport($buf, $dispatcher = null, $addressEncoder = null, $command = '/usr/sbin/sendmail -bs')
     {