From f45dae8a8143b806a7ffea63e6e93b8e2bd1fc74 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 15 Dec 2022 23:59:33 -0800 Subject: [PATCH] CiviUnitTestCase - Remove inert property `$DBResetRequired` This property is assigned by ~30 tests, but it is never used. --- ext/civigrant/tests/phpunit/api/v3/GrantTest.php | 2 -- tests/phpunit/CRM/Core/Page/HookTest.php | 1 - tests/phpunit/CRM/Core/Payment/BaseIPNTest.php | 1 - tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php | 1 - tests/phpunit/CiviTest/CiviUnitTestCase.php | 10 ---------- tests/phpunit/api/v3/ACLCachingTest.php | 2 -- tests/phpunit/api/v3/ACLPermissionTest.php | 1 - tests/phpunit/api/v3/APITest.php | 1 - tests/phpunit/api/v3/APIWrapperTest.php | 2 -- tests/phpunit/api/v3/CampaignTest.php | 2 -- tests/phpunit/api/v3/ContactTest.php | 2 -- tests/phpunit/api/v3/ContributionRecurTest.php | 2 -- tests/phpunit/api/v3/CustomValueTest.php | 2 -- tests/phpunit/api/v3/DomainTest.php | 7 ------- tests/phpunit/api/v3/EntityBatchTest.php | 2 -- tests/phpunit/api/v3/ImTest.php | 2 -- tests/phpunit/api/v3/JobProcessMailingTest.php | 1 - tests/phpunit/api/v3/JobProcessMembershipTest.php | 1 - tests/phpunit/api/v3/MailSettingsTest.php | 2 -- tests/phpunit/api/v3/MappingFieldTest.php | 2 -- tests/phpunit/api/v3/MappingTest.php | 2 -- tests/phpunit/api/v3/MultilingualTest.php | 1 - tests/phpunit/api/v3/OpenIDTest.php | 2 -- tests/phpunit/api/v3/ParticipantStatusTypeTest.php | 2 -- tests/phpunit/api/v3/PaymentTokenTest.php | 2 -- tests/phpunit/api/v3/PcpTest.php | 1 - tests/phpunit/api/v3/PriceFieldValueTest.php | 2 -- tests/phpunit/api/v3/PriceSetTest.php | 2 -- tests/phpunit/api/v3/SavedSearchTest.php | 1 - tests/phpunit/api/v3/SurveyTest.php | 1 - tests/phpunit/api/v3/SyntaxConformanceTest.php | 6 ------ tests/phpunit/api/v3/UserTest.php | 2 -- tests/phpunit/api/v3/UtilsTest.php | 1 - tests/phpunit/api/v3/WebsiteTest.php | 2 -- 34 files changed, 73 deletions(-) diff --git a/ext/civigrant/tests/phpunit/api/v3/GrantTest.php b/ext/civigrant/tests/phpunit/api/v3/GrantTest.php index c48c579770..3900b8cee0 100644 --- a/ext/civigrant/tests/phpunit/api/v3/GrantTest.php +++ b/ext/civigrant/tests/phpunit/api/v3/GrantTest.php @@ -25,8 +25,6 @@ class api_v3_GrantTest extends \PHPUnit\Framework\TestCase implements \Civi\Test protected $ids = []; protected $_entity = 'Grant'; - public $DBResetRequired = FALSE; - public function setUpHeadless() { return \Civi\Test::headless() ->install(['org.civicrm.afform', 'org.civicrm.search_kit']) diff --git a/tests/phpunit/CRM/Core/Page/HookTest.php b/tests/phpunit/CRM/Core/Page/HookTest.php index 61d76c4e4e..aee9f327cb 100644 --- a/tests/phpunit/CRM/Core/Page/HookTest.php +++ b/tests/phpunit/CRM/Core/Page/HookTest.php @@ -4,7 +4,6 @@ * Test that page hooks only get invoked once per page run. */ class CRM_Core_Page_HookTest extends CiviUnitTestCase { - public $DBResetRequired = TRUE; /** * The list of classes extending CRM_Core_Page_Basic: the ones to try the diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php index 5d7ff4d8f4..5fdc3ed032 100644 --- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php @@ -54,7 +54,6 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase { * @var int */ protected $_membershipStatusID; - public $DBResetRequired = FALSE; /** * Setup function. diff --git a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php index 7d8d83d5aa..d3b8677a82 100644 --- a/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php +++ b/tests/phpunit/CRM/Mailing/BaseMailingSystemTest.php @@ -27,7 +27,6 @@ abstract class CRM_Mailing_BaseMailingSystemTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $DBResetRequired = FALSE; public $defaultParams = []; private $_groupID; diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index 71b233213d..8f08a91931 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -105,16 +105,6 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase { */ protected $tempDirs; - /** - * DBResetRequired allows skipping DB reset - * in specific test case. If you still need - * to reset single test (method) of such case, call - * $this->cleanDB() in the first line of this - * test (method). - * @var bool - */ - public $DBResetRequired = TRUE; - /** * @var CRM_Core_Transaction|null */ diff --git a/tests/phpunit/api/v3/ACLCachingTest.php b/tests/phpunit/api/v3/ACLCachingTest.php index 4f24ffefe4..aeea362c22 100644 --- a/tests/phpunit/api/v3/ACLCachingTest.php +++ b/tests/phpunit/api/v3/ACLCachingTest.php @@ -19,8 +19,6 @@ class api_v3_ACLCachingTest extends CiviUnitTestCase { protected $_params; - public $DBResetRequired = FALSE; - public function setUp(): void { parent::setUp(); } diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php index 076f8dc024..3e0c2a4bdb 100644 --- a/tests/phpunit/api/v3/ACLPermissionTest.php +++ b/tests/phpunit/api/v3/ACLPermissionTest.php @@ -35,7 +35,6 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase { */ protected $isValidateFinancialsOnPostAssert = FALSE; - public $DBResetRequired = FALSE; protected $_entity; /** diff --git a/tests/phpunit/api/v3/APITest.php b/tests/phpunit/api/v3/APITest.php index f091f5006a..df1858f7e9 100644 --- a/tests/phpunit/api/v3/APITest.php +++ b/tests/phpunit/api/v3/APITest.php @@ -16,7 +16,6 @@ * @group headless */ class api_v3_APITest extends CiviUnitTestCase { - public $DBResetRequired = FALSE; protected $_apiversion = 3; diff --git a/tests/phpunit/api/v3/APIWrapperTest.php b/tests/phpunit/api/v3/APIWrapperTest.php index 2c0734927c..770f6eba06 100644 --- a/tests/phpunit/api/v3/APIWrapperTest.php +++ b/tests/phpunit/api/v3/APIWrapperTest.php @@ -18,8 +18,6 @@ require_once 'api/Wrapper.php'; * @group headless */ class api_v3_APIWrapperTest extends CiviUnitTestCase { - public $DBResetRequired = FALSE; - protected $_apiversion = 3; diff --git a/tests/phpunit/api/v3/CampaignTest.php b/tests/phpunit/api/v3/CampaignTest.php index 86859bbc3e..1ba6058559 100644 --- a/tests/phpunit/api/v3/CampaignTest.php +++ b/tests/phpunit/api/v3/CampaignTest.php @@ -17,8 +17,6 @@ class api_v3_CampaignTest extends CiviUnitTestCase { protected $params; protected $id; - public $DBResetRequired = FALSE; - public function setUp(): void { $this->params = [ 'title' => "campaign title", diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php index 7a6aeaebc1..053aeee990 100644 --- a/tests/phpunit/api/v3/ContactTest.php +++ b/tests/phpunit/api/v3/ContactTest.php @@ -42,8 +42,6 @@ class api_v3_ContactTest extends CiviUnitTestCase { use CRMTraits_Custom_CustomDataTrait; - public $DBResetRequired = FALSE; - protected $_entity; protected $_params; diff --git a/tests/phpunit/api/v3/ContributionRecurTest.php b/tests/phpunit/api/v3/ContributionRecurTest.php index 2f7f6b5bf7..b7be60cb7e 100644 --- a/tests/phpunit/api/v3/ContributionRecurTest.php +++ b/tests/phpunit/api/v3/ContributionRecurTest.php @@ -20,8 +20,6 @@ class api_v3_ContributionRecurTest extends CiviUnitTestCase { protected $params; protected $_entity = 'ContributionRecur'; - public $DBResetRequired = FALSE; - /** * @throws \CRM_Core_Exception */ diff --git a/tests/phpunit/api/v3/CustomValueTest.php b/tests/phpunit/api/v3/CustomValueTest.php index fe426d7761..a7c77e0827 100644 --- a/tests/phpunit/api/v3/CustomValueTest.php +++ b/tests/phpunit/api/v3/CustomValueTest.php @@ -19,8 +19,6 @@ class api_v3_CustomValueTest extends CiviUnitTestCase { protected $optionGroup; - public $DBResetRequired = FALSE; - /** * @throws \CRM_Core_Exception */ diff --git a/tests/phpunit/api/v3/DomainTest.php b/tests/phpunit/api/v3/DomainTest.php index 3f1f65aa58..6c5d0f5858 100644 --- a/tests/phpunit/api/v3/DomainTest.php +++ b/tests/phpunit/api/v3/DomainTest.php @@ -18,13 +18,6 @@ */ class api_v3_DomainTest extends CiviUnitTestCase { - /** - * This test case doesn't require DB reset - apart from - * where cleanDB() is called. - * @var bool - */ - public $DBResetRequired = FALSE; - protected $params; /** diff --git a/tests/phpunit/api/v3/EntityBatchTest.php b/tests/phpunit/api/v3/EntityBatchTest.php index 58b34040c0..d0fa5102fb 100644 --- a/tests/phpunit/api/v3/EntityBatchTest.php +++ b/tests/phpunit/api/v3/EntityBatchTest.php @@ -19,8 +19,6 @@ class api_v3_EntityBatchTest extends CiviUnitTestCase { protected $id; protected $_entity; - public $DBResetRequired = FALSE; - /** * @throws \CRM_Core_Exception */ diff --git a/tests/phpunit/api/v3/ImTest.php b/tests/phpunit/api/v3/ImTest.php index 6002841201..51f5d49726 100644 --- a/tests/phpunit/api/v3/ImTest.php +++ b/tests/phpunit/api/v3/ImTest.php @@ -21,8 +21,6 @@ class api_v3_ImTest extends CiviUnitTestCase { protected $id; protected $_entity; - public $DBResetRequired = FALSE; - public function setUp(): void { parent::setUp(); $this->useTransaction(TRUE); diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php index 0c75c11767..9336c42034 100644 --- a/tests/phpunit/api/v3/JobProcessMailingTest.php +++ b/tests/phpunit/api/v3/JobProcessMailingTest.php @@ -27,7 +27,6 @@ class api_v3_JobProcessMailingTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $DBResetRequired = FALSE; public $_entity = 'Job'; public $_params = []; private $_groupID; diff --git a/tests/phpunit/api/v3/JobProcessMembershipTest.php b/tests/phpunit/api/v3/JobProcessMembershipTest.php index e35484282a..96ddda6bcc 100644 --- a/tests/phpunit/api/v3/JobProcessMembershipTest.php +++ b/tests/phpunit/api/v3/JobProcessMembershipTest.php @@ -26,7 +26,6 @@ class api_v3_JobProcessMembershipTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $DBResetRequired = FALSE; public $_entity = 'Job'; /** diff --git a/tests/phpunit/api/v3/MailSettingsTest.php b/tests/phpunit/api/v3/MailSettingsTest.php index 534e24ce6b..0f8cd3c2ed 100644 --- a/tests/phpunit/api/v3/MailSettingsTest.php +++ b/tests/phpunit/api/v3/MailSettingsTest.php @@ -22,8 +22,6 @@ class api_v3_MailSettingsTest extends CiviUnitTestCase { protected $id; - public $DBResetRequired = FALSE; - public function setUp(): void { $this->params = [ 'domain_id' => 1, diff --git a/tests/phpunit/api/v3/MappingFieldTest.php b/tests/phpunit/api/v3/MappingFieldTest.php index eac98e582a..9b77d5db52 100644 --- a/tests/phpunit/api/v3/MappingFieldTest.php +++ b/tests/phpunit/api/v3/MappingFieldTest.php @@ -23,8 +23,6 @@ class api_v3_MappingFieldTest extends CiviUnitTestCase { protected $id; protected $_entity; - public $DBResetRequired = FALSE; - public function setUp(): void { parent::setUp(); $this->useTransaction(TRUE); diff --git a/tests/phpunit/api/v3/MappingTest.php b/tests/phpunit/api/v3/MappingTest.php index f8fc8376b1..4418b8661f 100644 --- a/tests/phpunit/api/v3/MappingTest.php +++ b/tests/phpunit/api/v3/MappingTest.php @@ -23,8 +23,6 @@ class api_v3_MappingTest extends CiviUnitTestCase { protected $id; protected $_entity; - public $DBResetRequired = FALSE; - public function setUp(): void { parent::setUp(); $this->useTransaction(TRUE); diff --git a/tests/phpunit/api/v3/MultilingualTest.php b/tests/phpunit/api/v3/MultilingualTest.php index 4b1e4e61d7..4186da2f93 100644 --- a/tests/phpunit/api/v3/MultilingualTest.php +++ b/tests/phpunit/api/v3/MultilingualTest.php @@ -18,7 +18,6 @@ */ class api_v3_MultilingualTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $DBResetRequired = FALSE; /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/phpunit/api/v3/OpenIDTest.php b/tests/phpunit/api/v3/OpenIDTest.php index 34db4ab6e8..4c7a031242 100644 --- a/tests/phpunit/api/v3/OpenIDTest.php +++ b/tests/phpunit/api/v3/OpenIDTest.php @@ -29,8 +29,6 @@ class api_v3_OpenIDTest extends CiviUnitTestCase { protected $id; protected $_entity; - public $DBResetRequired = FALSE; - public function setUp(): void { parent::setUp(); $this->useTransaction(); diff --git a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php index 441b12ccbc..9725f9aa6b 100644 --- a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php +++ b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php @@ -18,8 +18,6 @@ class api_v3_ParticipantStatusTypeTest extends CiviUnitTestCase { protected $params; protected $id; - public $DBResetRequired = FALSE; - public function setUp(): void { $this->_apiversion = 3; $this->params = [ diff --git a/tests/phpunit/api/v3/PaymentTokenTest.php b/tests/phpunit/api/v3/PaymentTokenTest.php index cb7d1b9a4f..51f5401cd0 100644 --- a/tests/phpunit/api/v3/PaymentTokenTest.php +++ b/tests/phpunit/api/v3/PaymentTokenTest.php @@ -17,8 +17,6 @@ class api_v3_PaymentTokenTest extends CiviUnitTestCase { protected $params; protected $id; - public $DBResetRequired = FALSE; - /** * Setup for class. * diff --git a/tests/phpunit/api/v3/PcpTest.php b/tests/phpunit/api/v3/PcpTest.php index 500f963a92..262a00d823 100644 --- a/tests/phpunit/api/v3/PcpTest.php +++ b/tests/phpunit/api/v3/PcpTest.php @@ -31,7 +31,6 @@ class api_v3_PcpTest extends CiviUnitTestCase { protected $params; protected $entity = 'Pcp'; - public $DBResetRequired = TRUE; public function setUp(): void { $this->params = [ diff --git a/tests/phpunit/api/v3/PriceFieldValueTest.php b/tests/phpunit/api/v3/PriceFieldValueTest.php index 24518fe5cd..7c2b4e3f4c 100644 --- a/tests/phpunit/api/v3/PriceFieldValueTest.php +++ b/tests/phpunit/api/v3/PriceFieldValueTest.php @@ -20,8 +20,6 @@ class api_v3_PriceFieldValueTest extends CiviUnitTestCase { protected $priceSetID = 0; protected $_entity = 'price_field_value'; - public $DBResetRequired = TRUE; - /** * @var int */ diff --git a/tests/phpunit/api/v3/PriceSetTest.php b/tests/phpunit/api/v3/PriceSetTest.php index f9f0bc446b..1eb8dd58ad 100644 --- a/tests/phpunit/api/v3/PriceSetTest.php +++ b/tests/phpunit/api/v3/PriceSetTest.php @@ -20,8 +20,6 @@ class api_v3_PriceSetTest extends CiviUnitTestCase { protected $contactIds = []; protected $_entity = 'price_set'; - public $DBResetRequired = TRUE; - /** * Set up for class. */ diff --git a/tests/phpunit/api/v3/SavedSearchTest.php b/tests/phpunit/api/v3/SavedSearchTest.php index f9e0d660a6..b733669c16 100644 --- a/tests/phpunit/api/v3/SavedSearchTest.php +++ b/tests/phpunit/api/v3/SavedSearchTest.php @@ -37,7 +37,6 @@ class api_v3_SavedSearchTest extends CiviUnitTestCase { protected $params; protected $id; protected $_entity; - public $DBResetRequired = FALSE; public function setUp(): void { parent::setUp(); diff --git a/tests/phpunit/api/v3/SurveyTest.php b/tests/phpunit/api/v3/SurveyTest.php index d08f53cc87..6713719e47 100644 --- a/tests/phpunit/api/v3/SurveyTest.php +++ b/tests/phpunit/api/v3/SurveyTest.php @@ -31,7 +31,6 @@ class api_v3_SurveyTest extends CiviUnitTestCase { protected $params; protected $entity = 'survey'; - public $DBResetRequired = FALSE; public function setUp(): void { $phoneBankActivityTypeID = $this->callAPISuccessGetValue('Option_value', [ diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index 4dbb0434da..9d136a35ff 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -40,12 +40,6 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { */ protected $deletableTestObjects; - /** - * This test case doesn't require DB reset. - * @var bool - */ - public $DBResetRequired = FALSE; - protected $_entity; /** diff --git a/tests/phpunit/api/v3/UserTest.php b/tests/phpunit/api/v3/UserTest.php index 7d819181b3..41dec82986 100644 --- a/tests/phpunit/api/v3/UserTest.php +++ b/tests/phpunit/api/v3/UserTest.php @@ -22,8 +22,6 @@ class api_v3_UserTest extends CiviUnitTestCase { protected $_entity = 'User'; protected $contactID; - public $DBResetRequired = FALSE; - public function setUp(): void { parent::setUp(); $this->contactID = $this->createLoggedInUser(); diff --git a/tests/phpunit/api/v3/UtilsTest.php b/tests/phpunit/api/v3/UtilsTest.php index 21bdf2049d..2d72d8da0d 100644 --- a/tests/phpunit/api/v3/UtilsTest.php +++ b/tests/phpunit/api/v3/UtilsTest.php @@ -17,7 +17,6 @@ */ class api_v3_UtilsTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $DBResetRequired = FALSE; public $_contactID = 1; diff --git a/tests/phpunit/api/v3/WebsiteTest.php b/tests/phpunit/api/v3/WebsiteTest.php index b2bc8f670e..923465335e 100644 --- a/tests/phpunit/api/v3/WebsiteTest.php +++ b/tests/phpunit/api/v3/WebsiteTest.php @@ -22,8 +22,6 @@ class api_v3_WebsiteTest extends CiviUnitTestCase { protected $id; protected $_entity; - public $DBResetRequired = FALSE; - public function setUp(): void { parent::setUp(); $this->useTransaction(); -- 2.25.1