From 0692ce5b625abeadf3a8ef1632a081d7d1f69e5d Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Wed, 28 Dec 2022 15:46:06 +0900 Subject: [PATCH] test: Updated TestSuite class for PHPUnit 9.5 --- lib/Cake/Test/Case/AllBehaviorsTest.php | 2 +- lib/Cake/Test/Case/AllCacheTest.php | 2 +- lib/Cake/Test/Case/AllComponentsTest.php | 2 +- lib/Cake/Test/Case/AllConfigureTest.php | 2 +- lib/Cake/Test/Case/AllConsoleTest.php | 2 +- lib/Cake/Test/Case/AllControllerTest.php | 2 +- lib/Cake/Test/Case/AllCoreTest.php | 2 +- lib/Cake/Test/Case/AllDatabaseTest.php | 4 ++-- lib/Cake/Test/Case/AllDbRelatedTest.php | 4 ++-- lib/Cake/Test/Case/AllErrorTest.php | 2 +- lib/Cake/Test/Case/AllEventTest.php | 2 +- lib/Cake/Test/Case/AllHelpersTest.php | 2 +- lib/Cake/Test/Case/AllI18nTest.php | 2 +- lib/Cake/Test/Case/AllLogTest.php | 2 +- lib/Cake/Test/Case/AllNetworkTest.php | 2 +- lib/Cake/Test/Case/AllRoutingTest.php | 2 +- lib/Cake/Test/Case/AllTestSuiteTest.php | 2 +- lib/Cake/Test/Case/AllTestsTest.php | 4 ++-- lib/Cake/Test/Case/AllUtilityTest.php | 2 +- lib/Cake/Test/Case/AllViewTest.php | 2 +- lib/Cake/Test/Case/Console/AllConsoleLibsTest.php | 2 +- lib/Cake/Test/Case/Console/AllConsoleTest.php | 2 +- lib/Cake/Test/Case/Console/AllShellsTest.php | 2 +- lib/Cake/Test/Case/Console/AllTasksTest.php | 2 +- lib/Cake/Test/Case/Model/Behavior/TreeBehaviorTest.php | 2 +- lib/Cake/Test/Case/Model/ModelTest.php | 4 ++-- lib/Cake/TestSuite/CakeTestSuite.php | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/Cake/Test/Case/AllBehaviorsTest.php b/lib/Cake/Test/Case/AllBehaviorsTest.php index b13c942bf..1d3e57107 100644 --- a/lib/Cake/Test/Case/AllBehaviorsTest.php +++ b/lib/Cake/Test/Case/AllBehaviorsTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllBehaviorsTest extends PHPUnit_Framework_TestSuite { +class AllBehaviorsTest extends \PHPUnit\Framework\TestSuite { /** * Suite define the tests for this suite diff --git a/lib/Cake/Test/Case/AllCacheTest.php b/lib/Cake/Test/Case/AllCacheTest.php index 04aa47412..868c40de4 100644 --- a/lib/Cake/Test/Case/AllCacheTest.php +++ b/lib/Cake/Test/Case/AllCacheTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllCacheTest extends PHPUnit_Framework_TestSuite { +class AllCacheTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllComponentsTest.php b/lib/Cake/Test/Case/AllComponentsTest.php index 1426eacc8..9ad258ee5 100644 --- a/lib/Cake/Test/Case/AllComponentsTest.php +++ b/lib/Cake/Test/Case/AllComponentsTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllComponentsTest extends PHPUnit_Framework_TestSuite { +class AllComponentsTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllConfigureTest.php b/lib/Cake/Test/Case/AllConfigureTest.php index 30db1ead2..56867bb1b 100644 --- a/lib/Cake/Test/Case/AllConfigureTest.php +++ b/lib/Cake/Test/Case/AllConfigureTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllConfigureTest extends PHPUnit_Framework_TestSuite { +class AllConfigureTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllConsoleTest.php b/lib/Cake/Test/Case/AllConsoleTest.php index 74f11b9f9..aec0b3a66 100644 --- a/lib/Cake/Test/Case/AllConsoleTest.php +++ b/lib/Cake/Test/Case/AllConsoleTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllConsoleTest extends PHPUnit_Framework_TestSuite { +class AllConsoleTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllControllerTest.php b/lib/Cake/Test/Case/AllControllerTest.php index e6f5644d7..1bef8b4a7 100644 --- a/lib/Cake/Test/Case/AllControllerTest.php +++ b/lib/Cake/Test/Case/AllControllerTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllControllersTest extends PHPUnit_Framework_TestSuite { +class AllControllerTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllCoreTest.php b/lib/Cake/Test/Case/AllCoreTest.php index dd6f2d318..d9f849a63 100644 --- a/lib/Cake/Test/Case/AllCoreTest.php +++ b/lib/Cake/Test/Case/AllCoreTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllCoreTest extends PHPUnit_Framework_TestSuite { +class AllCoreTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllDatabaseTest.php b/lib/Cake/Test/Case/AllDatabaseTest.php index ed17be717..26c6eef15 100644 --- a/lib/Cake/Test/Case/AllDatabaseTest.php +++ b/lib/Cake/Test/Case/AllDatabaseTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllDatabaseTest extends PHPUnit_Framework_TestSuite { +class AllDatabaseTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. @@ -31,7 +31,7 @@ class AllDatabaseTest extends PHPUnit_Framework_TestSuite { * @return void */ public static function suite() { - $suite = new PHPUnit_Framework_TestSuite('Datasources, Schema and DbAcl tests'); + $suite = new \PHPUnit\Framework\TestSuite('Datasources, Schema and DbAcl tests'); $path = CORE_TEST_CASES . DS . 'Model' . DS; $tasks = array( diff --git a/lib/Cake/Test/Case/AllDbRelatedTest.php b/lib/Cake/Test/Case/AllDbRelatedTest.php index 85ba00ab8..1cd5a2f70 100644 --- a/lib/Cake/Test/Case/AllDbRelatedTest.php +++ b/lib/Cake/Test/Case/AllDbRelatedTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllDbRelatedTest extends PHPUnit_Framework_TestSuite { +class AllDbRelatedTest extends \PHPUnit\Framework\TestSuite { /** * Suite define the tests for this suite @@ -31,7 +31,7 @@ class AllDbRelatedTest extends PHPUnit_Framework_TestSuite { * @return void */ public static function suite() { - $suite = new PHPUnit_Framework_TestSuite('All Db Related Tests'); + $suite = new \PHPUnit\Framework\TestSuite('All Db Related Tests'); $path = CORE_TEST_CASES . DS; diff --git a/lib/Cake/Test/Case/AllErrorTest.php b/lib/Cake/Test/Case/AllErrorTest.php index d02323183..16636af2b 100644 --- a/lib/Cake/Test/Case/AllErrorTest.php +++ b/lib/Cake/Test/Case/AllErrorTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllErrorTest extends PHPUnit_Framework_TestSuite { +class AllErrorTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllEventTest.php b/lib/Cake/Test/Case/AllEventTest.php index 51218d5c6..1f259edcb 100644 --- a/lib/Cake/Test/Case/AllEventTest.php +++ b/lib/Cake/Test/Case/AllEventTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllEventTest extends PHPUnit_Framework_TestSuite { +class AllEventTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllHelpersTest.php b/lib/Cake/Test/Case/AllHelpersTest.php index 67071c43c..3a5db1cd4 100644 --- a/lib/Cake/Test/Case/AllHelpersTest.php +++ b/lib/Cake/Test/Case/AllHelpersTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllHelpersTest extends PHPUnit_Framework_TestSuite { +class AllHelpersTest extends \PHPUnit\Framework\TestSuite { /** * suite declares tests to run diff --git a/lib/Cake/Test/Case/AllI18nTest.php b/lib/Cake/Test/Case/AllI18nTest.php index 28edf60a4..c8da8dd3d 100644 --- a/lib/Cake/Test/Case/AllI18nTest.php +++ b/lib/Cake/Test/Case/AllI18nTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllLocalizationTest extends PHPUnit_Framework_TestSuite { +class AllI18nTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllLogTest.php b/lib/Cake/Test/Case/AllLogTest.php index 8f6ab9e07..03dd83675 100644 --- a/lib/Cake/Test/Case/AllLogTest.php +++ b/lib/Cake/Test/Case/AllLogTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllLogTest extends PHPUnit_Framework_TestSuite { +class AllLogTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllNetworkTest.php b/lib/Cake/Test/Case/AllNetworkTest.php index 0b2ba45b1..0f4221639 100644 --- a/lib/Cake/Test/Case/AllNetworkTest.php +++ b/lib/Cake/Test/Case/AllNetworkTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllNetworkTest extends PHPUnit_Framework_TestSuite { +class AllNetworkTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllRoutingTest.php b/lib/Cake/Test/Case/AllRoutingTest.php index 1ff32095c..fcd802006 100644 --- a/lib/Cake/Test/Case/AllRoutingTest.php +++ b/lib/Cake/Test/Case/AllRoutingTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllRoutingTest extends PHPUnit_Framework_TestSuite { +class AllRoutingTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllTestSuiteTest.php b/lib/Cake/Test/Case/AllTestSuiteTest.php index dee9fb613..b390ab957 100644 --- a/lib/Cake/Test/Case/AllTestSuiteTest.php +++ b/lib/Cake/Test/Case/AllTestSuiteTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllTestSuiteTest extends PHPUnit_Framework_TestSuite { +class AllTestSuiteTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllTestsTest.php b/lib/Cake/Test/Case/AllTestsTest.php index 00e52161f..df9ad5c67 100644 --- a/lib/Cake/Test/Case/AllTestsTest.php +++ b/lib/Cake/Test/Case/AllTestsTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllTests extends PHPUnit_Framework_TestSuite { +class AllTestsTest extends \PHPUnit\Framework\TestSuite { /** * Suite define the tests for this suite @@ -31,7 +31,7 @@ class AllTests extends PHPUnit_Framework_TestSuite { * @return void */ public static function suite() { - $suite = new PHPUnit_Framework_TestSuite('All Tests'); + $suite = new \PHPUnit\Framework\TestSuite('All Tests'); $path = CORE_TEST_CASES . DS; diff --git a/lib/Cake/Test/Case/AllUtilityTest.php b/lib/Cake/Test/Case/AllUtilityTest.php index bf82809eb..e47dbb841 100644 --- a/lib/Cake/Test/Case/AllUtilityTest.php +++ b/lib/Cake/Test/Case/AllUtilityTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllUtilityTest extends PHPUnit_Framework_TestSuite { +class AllUtilityTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/AllViewTest.php b/lib/Cake/Test/Case/AllViewTest.php index ad38ea468..4b7f8a636 100644 --- a/lib/Cake/Test/Case/AllViewTest.php +++ b/lib/Cake/Test/Case/AllViewTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class AllViewTest extends PHPUnit_Framework_TestSuite { +class AllViewTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/Console/AllConsoleLibsTest.php b/lib/Cake/Test/Case/Console/AllConsoleLibsTest.php index 47b00e5de..76077e0b1 100644 --- a/lib/Cake/Test/Case/Console/AllConsoleLibsTest.php +++ b/lib/Cake/Test/Case/Console/AllConsoleLibsTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case.Console */ -class AllConsoleLibsTest extends PHPUnit_Framework_TestSuite { +class AllConsoleLibsTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/Console/AllConsoleTest.php b/lib/Cake/Test/Case/Console/AllConsoleTest.php index 9d9d288ec..9b2dca5cf 100644 --- a/lib/Cake/Test/Case/Console/AllConsoleTest.php +++ b/lib/Cake/Test/Case/Console/AllConsoleTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case.Console */ -class AllConsoleTest extends PHPUnit_Framework_TestSuite { +class AllConsoleTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/Console/AllShellsTest.php b/lib/Cake/Test/Case/Console/AllShellsTest.php index ef3b4cd0e..bb52c4582 100644 --- a/lib/Cake/Test/Case/Console/AllShellsTest.php +++ b/lib/Cake/Test/Case/Console/AllShellsTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case.Console */ -class AllShellsTest extends PHPUnit_Framework_TestSuite { +class AllShellsTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/Console/AllTasksTest.php b/lib/Cake/Test/Case/Console/AllTasksTest.php index f13dbf380..d3d4984c5 100644 --- a/lib/Cake/Test/Case/Console/AllTasksTest.php +++ b/lib/Cake/Test/Case/Console/AllTasksTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case.Console */ -class AllTasksTest extends PHPUnit_Framework_TestSuite { +class AllTasksTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorTest.php index 2540b59a3..2022f7560 100644 --- a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorTest.php +++ b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case.Model.Behavior */ -class TreeBehaviorTest extends PHPUnit_Framework_TestSuite { +class TreeBehaviorTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. diff --git a/lib/Cake/Test/Case/Model/ModelTest.php b/lib/Cake/Test/Case/Model/ModelTest.php index 1dffcaaff..fefd295a7 100644 --- a/lib/Cake/Test/Case/Model/ModelTest.php +++ b/lib/Cake/Test/Case/Model/ModelTest.php @@ -23,7 +23,7 @@ * * @package Cake.Test.Case */ -class ModelTest extends PHPUnit_Framework_TestSuite { +class ModelTest extends \PHPUnit\Framework\TestSuite { /** * suite method, defines tests for this suite. @@ -31,7 +31,7 @@ class ModelTest extends PHPUnit_Framework_TestSuite { * @return void */ public static function suite() { - $suite = new PHPUnit_Framework_TestSuite('All Model related class tests'); + $suite = new \PHPUnit\Framework\TestSuite('All Model related class tests'); $suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'Validator' . DS . 'CakeValidationSetTest.php'); $suite->addTestFile(CORE_TEST_CASES . DS . 'Model' . DS . 'Validator' . DS . 'CakeValidationRuleTest.php'); diff --git a/lib/Cake/TestSuite/CakeTestSuite.php b/lib/Cake/TestSuite/CakeTestSuite.php index b31a3c627..e29e7c13d 100644 --- a/lib/Cake/TestSuite/CakeTestSuite.php +++ b/lib/Cake/TestSuite/CakeTestSuite.php @@ -23,7 +23,7 @@ App::uses('Folder', 'Utility'); * * @package Cake.TestSuite */ -class CakeTestSuite extends PHPUnit_Framework_TestSuite { +class CakeTestSuite extends \PHPUnit\Framework\TestSuite { /** * Adds all the files in a directory to the test suite. Does not recurse through directories.