From b9f2256042dc58a9dc03c31ac1938a6ffe392115 Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 8 May 2016 09:36:12 +1000 Subject: [PATCH] CRM-18536 Remove require_onces no longer required Tim hacked class loader for this --- tests/phpunit/AllTests.php | 5 ----- tests/phpunit/CRM/Activity/AllTests.php | 5 ----- tests/phpunit/CRM/AllTests.php | 5 ----- tests/phpunit/CRM/Case/AllTests.php | 5 ----- tests/phpunit/CRM/Case/BAO/CaseTypeForkTest.php | 2 -- tests/phpunit/CRM/Contact/AllTests.php | 5 ----- tests/phpunit/CRM/Contribute/AllTests.php | 5 ----- tests/phpunit/CRM/Contribute/Form/ContributionTest.php | 1 - tests/phpunit/CRM/Core/AllTests.php | 5 ----- tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php | 1 - tests/phpunit/CRM/Core/Payment/BaseIPNTest.php | 2 -- tests/phpunit/CRM/Event/AllTests.php | 5 ----- tests/phpunit/CRM/Extension/AllTests.php | 5 ----- tests/phpunit/CRM/Extension/Container/AllTests.php | 5 ----- tests/phpunit/CRM/Extension/Manager/AllTests.php | 5 ----- tests/phpunit/CRM/Member/AllTests.php | 5 ----- tests/phpunit/CRM/Member/Form/AllTests.php | 5 ----- tests/phpunit/CRM/Pledge/AllTests.php | 5 ----- tests/phpunit/CRM/Queue/AllTests.php | 5 ----- tests/phpunit/CRM/Queue/Queue/AllTests.php | 5 ----- tests/phpunit/CRM/Queue/QueueTest.php | 1 - tests/phpunit/CRM/Queue/RunnerTest.php | 1 - tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php | 2 -- tests/phpunit/CRM/Utils/Cache/AllTests.php | 5 ----- tests/phpunit/CRM/Utils/SignerTest.php | 1 - tests/phpunit/Civi/ActionSchedule/AbstractMappingTest.php | 1 - tests/phpunit/Civi/AllTests.php | 5 ----- tests/phpunit/Civi/CCase/SequenceListenerTest.php | 2 -- tests/phpunit/api/v3/AllTests.php | 5 ----- tests/phpunit/api/v3/CaseTest.php | 1 - tests/phpunit/api/v3/CaseTypeTest.php | 2 -- tests/phpunit/api/v3/FinancialTypeACLTest.php | 4 ---- 32 files changed, 116 deletions(-) diff --git a/tests/phpunit/AllTests.php b/tests/phpunit/AllTests.php index 88b46301dc..bbd44360f7 100644 --- a/tests/phpunit/AllTests.php +++ b/tests/phpunit/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Activity/AllTests.php b/tests/phpunit/CRM/Activity/AllTests.php index 0da000a3a1..3dee67f139 100644 --- a/tests/phpunit/CRM/Activity/AllTests.php +++ b/tests/phpunit/CRM/Activity/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/AllTests.php b/tests/phpunit/CRM/AllTests.php index dcaa500eb5..f1c23ce168 100644 --- a/tests/phpunit/CRM/AllTests.php +++ b/tests/phpunit/CRM/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all CRM test suites * diff --git a/tests/phpunit/CRM/Case/AllTests.php b/tests/phpunit/CRM/Case/AllTests.php index 5cb45d3af1..012c6781c6 100644 --- a/tests/phpunit/CRM/Case/AllTests.php +++ b/tests/phpunit/CRM/Case/AllTests.php @@ -1,10 +1,5 @@ . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Contribute/AllTests.php b/tests/phpunit/CRM/Contribute/AllTests.php index 5eb8f79759..9b0fb08471 100644 --- a/tests/phpunit/CRM/Contribute/AllTests.php +++ b/tests/phpunit/CRM/Contribute/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php index c4bdeb1b45..7144656ca6 100644 --- a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php +++ b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php @@ -452,7 +452,6 @@ class CRM_Contribute_Form_ContributionTest extends CiviUnitTestCase { */ public function testSubmitEmailReceipt() { $form = new CRM_Contribute_Form_Contribution(); - require_once 'CiviTest/CiviMailUtils.php'; $mut = new CiviMailUtils($this, TRUE); $form->testSubmit(array( 'total_amount' => 50, diff --git a/tests/phpunit/CRM/Core/AllTests.php b/tests/phpunit/CRM/Core/AllTests.php index 2f8cc3d3a1..d37a41ca33 100644 --- a/tests/phpunit/CRM/Core/AllTests.php +++ b/tests/phpunit/CRM/Core/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php index b4301f388e..a0f2c14c57 100644 --- a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php +++ b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php @@ -39,7 +39,6 @@ class CRM_Core_BAO_ActionScheduleTest extends CiviUnitTestCase { public function setUp() { parent::setUp(); - require_once 'CiviTest/CiviMailUtils.php'; $this->mut = new CiviMailUtils($this, TRUE); $this->fixtures['rolling_membership'] = array( diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php index ef6adbe48e..75938d4d7a 100644 --- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php +++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php @@ -269,7 +269,6 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase { public function testsendMailParticipantObjectsCheckLog() { $this->_setUpParticipantObjects(); $values = array(); - require_once 'CiviTest/CiviMailUtils.php'; $mut = new CiviMailUtils($this, TRUE); $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId); $this->IPN->sendMail($this->input, $this->ids, $this->objects, $values, FALSE, FALSE); @@ -296,7 +295,6 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase { 'civicrm_mailing_spool', ); $this->quickCleanup($tablesToTruncate, FALSE); - require_once 'CiviTest/CiviMailUtils.php'; $mut = new CiviMailUtils($this, TRUE); $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId); $this->IPN->sendMail($this->input, $this->ids, $this->objects, $values, FALSE, FALSE); diff --git a/tests/phpunit/CRM/Event/AllTests.php b/tests/phpunit/CRM/Event/AllTests.php index 47ebbec3f5..040ade5c46 100644 --- a/tests/phpunit/CRM/Event/AllTests.php +++ b/tests/phpunit/CRM/Event/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Extension/AllTests.php b/tests/phpunit/CRM/Extension/AllTests.php index fb20804b28..03061909c3 100644 --- a/tests/phpunit/CRM/Extension/AllTests.php +++ b/tests/phpunit/CRM/Extension/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Extension/Container/AllTests.php b/tests/phpunit/CRM/Extension/Container/AllTests.php index fe56a23aba..fc4225c3dd 100644 --- a/tests/phpunit/CRM/Extension/Container/AllTests.php +++ b/tests/phpunit/CRM/Extension/Container/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Extension/Manager/AllTests.php b/tests/phpunit/CRM/Extension/Manager/AllTests.php index 671551504a..8276d063b8 100644 --- a/tests/phpunit/CRM/Extension/Manager/AllTests.php +++ b/tests/phpunit/CRM/Extension/Manager/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Member/AllTests.php b/tests/phpunit/CRM/Member/AllTests.php index 6c4bc41d3f..2815763f7e 100644 --- a/tests/phpunit/CRM/Member/AllTests.php +++ b/tests/phpunit/CRM/Member/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Member/Form/AllTests.php b/tests/phpunit/CRM/Member/Form/AllTests.php index 097538a36e..ac1139e675 100644 --- a/tests/phpunit/CRM/Member/Form/AllTests.php +++ b/tests/phpunit/CRM/Member/Form/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Pledge/AllTests.php b/tests/phpunit/CRM/Pledge/AllTests.php index ca8c3aead1..19fe2c6f1b 100644 --- a/tests/phpunit/CRM/Pledge/AllTests.php +++ b/tests/phpunit/CRM/Pledge/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Queue/AllTests.php b/tests/phpunit/CRM/Queue/AllTests.php index 0c1f6bf0c6..9e1cb11e73 100644 --- a/tests/phpunit/CRM/Queue/AllTests.php +++ b/tests/phpunit/CRM/Queue/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Queue/Queue/AllTests.php b/tests/phpunit/CRM/Queue/Queue/AllTests.php index 92011114fd..2e38e07ba6 100644 --- a/tests/phpunit/CRM/Queue/Queue/AllTests.php +++ b/tests/phpunit/CRM/Queue/Queue/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites * diff --git a/tests/phpunit/CRM/Queue/QueueTest.php b/tests/phpunit/CRM/Queue/QueueTest.php index 07a0c550d3..911c2aead4 100644 --- a/tests/phpunit/CRM/Queue/QueueTest.php +++ b/tests/phpunit/CRM/Queue/QueueTest.php @@ -190,7 +190,6 @@ class CRM_Queue_QueueTest extends CiviUnitTestCase { $this->queue = $this->queueService->create($queueSpec); $this->assertTrue($this->queue instanceof CRM_Queue_Queue); - require_once 'CRM/Utils/Time.php'; CRM_Utils_Time::setTime('2012-04-01 1:00:00'); $this->queue->createItem(array( 'test-key' => 'a', diff --git a/tests/phpunit/CRM/Queue/RunnerTest.php b/tests/phpunit/CRM/Queue/RunnerTest.php index e6882ddd74..f93ba70469 100644 --- a/tests/phpunit/CRM/Queue/RunnerTest.php +++ b/tests/phpunit/CRM/Queue/RunnerTest.php @@ -33,7 +33,6 @@ class CRM_Queue_RunnerTest extends CiviUnitTestCase { public function setUp() { parent::setUp(); - require_once 'CRM/Queue/Service.php'; $this->queueService = CRM_Queue_Service::singleton(TRUE); $this->queue = $this->queueService->create(array( 'type' => 'Sql', diff --git a/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php b/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php index 1463681629..4574e4067a 100644 --- a/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php +++ b/tests/phpunit/CRM/Report/Form/Contribute/DetailTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviReportTestCase.php'; - /** * Test report outcome * diff --git a/tests/phpunit/CRM/Utils/Cache/AllTests.php b/tests/phpunit/CRM/Utils/Cache/AllTests.php index bb523abcf5..94c4c859af 100644 --- a/tests/phpunit/CRM/Utils/Cache/AllTests.php +++ b/tests/phpunit/CRM/Utils/Cache/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition. - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all test suites. * diff --git a/tests/phpunit/CRM/Utils/SignerTest.php b/tests/phpunit/CRM/Utils/SignerTest.php index a2bdc55d84..7f78f6240b 100644 --- a/tests/phpunit/CRM/Utils/SignerTest.php +++ b/tests/phpunit/CRM/Utils/SignerTest.php @@ -142,7 +142,6 @@ class CRM_Utils_SignerTest extends CiviUnitTestCase { ); foreach ($cases as $caseId => $case) { - require_once 'CRM/Utils/Signer.php'; $signer = new CRM_Utils_Signer('secret', array('a', 'b', 'c')); $signature = $signer->sign($case['signParams']); $this->assertTrue(!empty($signature) && is_string($signature)); // arbitrary diff --git a/tests/phpunit/Civi/ActionSchedule/AbstractMappingTest.php b/tests/phpunit/Civi/ActionSchedule/AbstractMappingTest.php index 55e0e9fc55..9d49fd77be 100644 --- a/tests/phpunit/Civi/ActionSchedule/AbstractMappingTest.php +++ b/tests/phpunit/Civi/ActionSchedule/AbstractMappingTest.php @@ -141,7 +141,6 @@ abstract class AbstractMappingTest extends \CiviUnitTestCase { parent::setUp(); $this->useTransaction(); - require_once 'CiviTest/CiviMailUtils.php'; $this->mut = new \CiviMailUtils($this, TRUE); $this->cronSchedule = array( diff --git a/tests/phpunit/Civi/AllTests.php b/tests/phpunit/Civi/AllTests.php index 23280526b7..220dae7447 100644 --- a/tests/phpunit/Civi/AllTests.php +++ b/tests/phpunit/Civi/AllTests.php @@ -30,11 +30,6 @@ * . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all CRM test suites * diff --git a/tests/phpunit/Civi/CCase/SequenceListenerTest.php b/tests/phpunit/Civi/CCase/SequenceListenerTest.php index 0c0a2708d2..48f83ec05f 100644 --- a/tests/phpunit/Civi/CCase/SequenceListenerTest.php +++ b/tests/phpunit/Civi/CCase/SequenceListenerTest.php @@ -1,8 +1,6 @@ . */ -/** - * Include parent class definition - */ -require_once 'CiviTest/CiviTestSuite.php'; - /** * Class containing all API v3 test suites * diff --git a/tests/phpunit/api/v3/CaseTest.php b/tests/phpunit/api/v3/CaseTest.php index cf9bdd0d75..8357d62c5c 100644 --- a/tests/phpunit/api/v3/CaseTest.php +++ b/tests/phpunit/api/v3/CaseTest.php @@ -32,7 +32,6 @@ /** * Include class definitions */ -require_once 'CiviTest/CiviCaseTestCase.php'; /** * Test APIv3 civicrm_case_* functions diff --git a/tests/phpunit/api/v3/CaseTypeTest.php b/tests/phpunit/api/v3/CaseTypeTest.php index 1ea03fa03a..0e63aacce0 100644 --- a/tests/phpunit/api/v3/CaseTypeTest.php +++ b/tests/phpunit/api/v3/CaseTypeTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviCaseTestCase.php'; - /** * Class api_v3_CaseTypeTest * @group headless diff --git a/tests/phpunit/api/v3/FinancialTypeACLTest.php b/tests/phpunit/api/v3/FinancialTypeACLTest.php index d17b5dd499..939d5c5209 100644 --- a/tests/phpunit/api/v3/FinancialTypeACLTest.php +++ b/tests/phpunit/api/v3/FinancialTypeACLTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/CiviMailUtils.php'; - - /** * Test APIv3 civicrm_contribute_* functions * -- 2.25.1