From 0eea664b7d0187f1287c6319702702e5d06a6891 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 28 Jan 2016 22:35:09 -0800 Subject: [PATCH] tests/phpunit/** - Remove unnecessary "require_once" statements Previous commit enabled autoloading for CiviTest classes. --- .../Activity/BAO/ActivityAssignmentTest.php | 3 --- .../CRM/Activity/BAO/ActivityTargetTest.php | 3 --- .../phpunit/CRM/Activity/BAO/ActivityTest.php | 2 +- tests/phpunit/CRM/Batch/Form/EntryTest.php | 3 --- tests/phpunit/CRM/Bridge/OG/DrupalTest.php | 2 +- tests/phpunit/CRM/Case/BAO/CaseTest.php | 1 - tests/phpunit/CRM/Case/BAO/CaseTypeTest.php | 1 - tests/phpunit/CRM/Case/BAO/QueryTest.php | 2 +- tests/phpunit/CRM/Case/XMLRepositoryTest.php | 2 -- tests/phpunit/CRM/Contact/BAO/ContactTest.php | 2 +- .../BAO/ContactType/ContactSearchTest.php | 2 +- .../Contact/BAO/ContactType/ContactTest.php | 1 - .../BAO/ContactType/ContactTypeTest.php | 1 - .../BAO/ContactType/RelationshipTest.php | 2 +- .../CRM/Contact/BAO/GroupContactCacheTest.php | 2 -- .../CRM/Contact/BAO/GroupContactTest.php | 2 -- tests/phpunit/CRM/Contact/BAO/GroupTest.php | 3 --- tests/phpunit/CRM/Contact/BAO/QueryTest.php | 2 +- .../Contact/Form/Search/Custom/GroupTest.php | 2 +- .../Contact/Form/Search/Custom/SampleTest.php | 1 - .../CRM/Contact/Import/Parser/ContactTest.php | 2 -- tests/phpunit/CRM/Contact/SelectorTest.php | 1 - .../Contribute/ActionMapping/ByTypeTest.php | 4 +-- .../Contribute/BAO/ContributionPageTest.php | 2 -- .../Contribute/BAO/ContributionRecurTest.php | 2 -- .../CRM/Contribute/BAO/ContributionTest.php | 2 -- .../Contribute/BAO/ContributionTypeTest.php | 2 -- .../CRM/Contribute/BAO/ManagePremiumsTest.php | 2 -- .../Contribute/Form/Contribution/MainTest.php | 4 --- .../CRM/Contribute/Form/ContributionTest.php | 5 ---- .../CRM/Core/BAO/ActionScheduleTest.php | 2 -- tests/phpunit/CRM/Core/BAO/AddressTest.php | 4 --- .../CRM/Core/BAO/ConfigSettingTest.php | 2 -- .../phpunit/CRM/Core/BAO/CustomFieldTest.php | 3 +-- .../phpunit/CRM/Core/BAO/CustomGroupTest.php | 5 ---- .../phpunit/CRM/Core/BAO/CustomQueryTest.php | 2 +- .../Core/BAO/CustomValueTableMultipleTest.php | 4 --- .../Core/BAO/CustomValueTableSetGetTest.php | 3 --- .../CRM/Core/BAO/CustomValueTableTest.php | 3 --- .../phpunit/CRM/Core/BAO/CustomValueTest.php | 3 --- tests/phpunit/CRM/Core/BAO/EmailTest.php | 2 +- .../CRM/Core/BAO/FinancialTrxnTest.php | 2 -- tests/phpunit/CRM/Core/BAO/IMTest.php | 2 -- tests/phpunit/CRM/Core/BAO/LocationTest.php | 4 --- tests/phpunit/CRM/Core/BAO/NavigationTest.php | 1 - tests/phpunit/CRM/Core/BAO/OpenIDTest.php | 2 +- tests/phpunit/CRM/Core/BAO/PhoneTest.php | 6 ----- .../phpunit/CRM/Core/BAO/PreferencesTest.php | 3 --- .../CRM/Core/BAO/RecurringEntityTest.php | 3 --- .../CRM/Core/BAO/SchemaHandlerTest.php | 2 -- tests/phpunit/CRM/Core/BAO/SettingTest.php | 3 --- tests/phpunit/CRM/Core/BAO/UFFieldTest.php | 2 -- .../CRM/Core/CommunityMessagesTest.php | 3 --- tests/phpunit/CRM/Core/Config/MailerTest.php | 2 -- .../CRM/Core/DAO/AllCoreTablesTest.php | 2 -- tests/phpunit/CRM/Core/DAOConformanceTest.php | 2 -- tests/phpunit/CRM/Core/DAOTest.php | 27 ++++++++++--------- tests/phpunit/CRM/Core/ErrorTest.php | 2 -- tests/phpunit/CRM/Core/FieldOptionsTest.php | 2 -- tests/phpunit/CRM/Core/InnoDBIndexerTest.php | 2 -- tests/phpunit/CRM/Core/JobManagerTest.php | 1 - .../phpunit/CRM/Core/ManagedEntitiesTest.php | 2 -- tests/phpunit/CRM/Core/MenuTest.php | 2 -- tests/phpunit/CRM/Core/Page/AJAXTest.php | 2 -- tests/phpunit/CRM/Core/Page/RedirectTest.php | 2 -- .../CRM/Core/Payment/AuthorizeNetIPNTest.php | 3 --- .../CRM/Core/Payment/AuthorizeNetTest.php | 3 --- .../phpunit/CRM/Core/Payment/BaseIPNTest.php | 3 --- .../CRM/Core/Payment/PayPalProIPNTest.php | 2 -- tests/phpunit/CRM/Core/PaymentTest.php | 3 --- .../phpunit/CRM/Core/Permission/BaseTest.php | 2 -- .../CRM/Core/Permission/GenericTest.php | 2 -- .../CRM/Core/Permission/JoomlaTest.php | 2 -- tests/phpunit/CRM/Core/PseudoConstantTest.php | 2 -- tests/phpunit/CRM/Core/RegionTest.php | 2 -- .../CRM/Core/Resources/StringsTest.php | 2 -- tests/phpunit/CRM/Core/ResourcesTest.php | 2 -- .../CRM/Core/Smarty/plugins/CrmScopeTest.php | 2 -- tests/phpunit/CRM/Core/TransactionTest.php | 1 - tests/phpunit/CRM/Dedupe/DedupeFinderTest.php | 2 +- tests/phpunit/CRM/Dedupe/MergerTest.php | 2 -- .../CRM/Event/BAO/AdditionalPaymentTest.php | 6 ----- .../CRM/Event/BAO/ParticipantStatusTest.php | 3 --- .../phpunit/CRM/Event/BAO/ParticipantTest.php | 6 ----- tests/phpunit/CRM/Export/BAO/ExportTest.php | 1 - tests/phpunit/CRM/Extension/BrowserTest.php | 2 -- .../CRM/Extension/Container/BasicTest.php | 2 -- .../Extension/Container/CollectionTest.php | 1 - .../CRM/Extension/Container/StaticTest.php | 2 -- tests/phpunit/CRM/Extension/InfoTest.php | 2 -- .../CRM/Extension/Manager/ModuleTest.php | 2 -- .../CRM/Extension/Manager/PaymentTest.php | 1 - .../CRM/Extension/Manager/ReportTest.php | 2 -- .../CRM/Extension/Manager/SearchTest.php | 2 -- tests/phpunit/CRM/Extension/ManagerTest.php | 1 - tests/phpunit/CRM/Extension/MapperTest.php | 2 -- .../Financial/BAO/FinancialAccountTest.php | 1 - .../CRM/Financial/BAO/FinancialItemTest.php | 3 --- .../BAO/FinancialTypeAccountTest.php | 1 - .../CRM/Financial/BAO/FinancialTypeTest.php | 1 - .../BAO/PaymentProcessorTypeTest.php | 4 --- .../Financial/Page/AjaxBatchSummaryTest.php | 1 - tests/phpunit/CRM/Financial/Page/AjaxTest.php | 1 - tests/phpunit/CRM/Group/Page/AjaxTest.php | 1 - tests/phpunit/CRM/Mailing/BAO/QueryTest.php | 2 -- tests/phpunit/CRM/Mailing/BAO/SpoolTest.php | 3 --- .../CRM/Member/BAO/MembershipLogTest.php | 4 --- .../CRM/Member/BAO/MembershipStatusTest.php | 3 --- .../phpunit/CRM/Member/BAO/MembershipTest.php | 8 ------ .../CRM/Member/BAO/MembershipTypeTest.php | 3 --- tests/phpunit/CRM/Member/BAO/QueryTest.php | 2 +- .../CRM/Member/Form/MembershipRenewalTest.php | 7 ----- .../CRM/Member/Form/MembershipTest.php | 8 ------ .../Member/Import/Parser/MembershipTest.php | 4 --- tests/phpunit/CRM/PCP/BAO/PCPTest.php | 3 --- .../CRM/Pledge/BAO/PledgeBlockTest.php | 4 --- .../CRM/Pledge/BAO/PledgePaymentTest.php | 3 --- tests/phpunit/CRM/Pledge/BAO/PledgeTest.php | 4 --- tests/phpunit/CRM/Price/BAO/PriceSetTest.php | 2 -- tests/phpunit/CRM/Queue/Queue/SqlTest.php | 3 --- tests/phpunit/CRM/Queue/QueueTest.php | 3 --- tests/phpunit/CRM/Queue/RunnerTest.php | 3 --- .../phpunit/CRM/UF/Page/ProfileEditorTest.php | 1 - .../phpunit/CRM/Utils/API/MatchOptionTest.php | 2 -- .../CRM/Utils/API/ReloadOptionTest.php | 2 -- tests/phpunit/CRM/Utils/ArrayTest.php | 1 - tests/phpunit/CRM/Utils/AutoCleanTest.php | 2 -- .../phpunit/CRM/Utils/Cache/SqlGroupTest.php | 2 -- .../phpunit/CRM/Utils/DeprecatedUtilsTest.php | 1 - tests/phpunit/CRM/Utils/FileTest.php | 1 - tests/phpunit/CRM/Utils/GlobalStackTest.php | 2 -- tests/phpunit/CRM/Utils/HTMLTest.php | 2 -- tests/phpunit/CRM/Utils/HookTest.php | 1 - tests/phpunit/CRM/Utils/HtmlToTextTest.php | 2 -- tests/phpunit/CRM/Utils/HttpClientTest.php | 1 - tests/phpunit/CRM/Utils/JSTest.php | 2 -- tests/phpunit/CRM/Utils/MailTest.php | 1 - .../CRM/Utils/Migrate/ImportExportTest.php | 1 - tests/phpunit/CRM/Utils/NumberTest.php | 1 - .../phpunit/CRM/Utils/QueryFormatterTest.php | 2 -- tests/phpunit/CRM/Utils/RestTest.php | 1 - tests/phpunit/CRM/Utils/RuleTest.php | 2 -- tests/phpunit/CRM/Utils/SQL/InsertTest.php | 1 - tests/phpunit/CRM/Utils/SQL/SelectTest.php | 1 - tests/phpunit/CRM/Utils/SignerTest.php | 1 - tests/phpunit/CRM/Utils/StringTest.php | 1 - tests/phpunit/CRM/Utils/SystemTest.php | 2 -- tests/phpunit/CRM/Utils/TimeTest.php | 2 -- tests/phpunit/CRM/Utils/TypeTest.php | 2 -- tests/phpunit/CRM/Utils/ZipTest.php | 1 - tests/phpunit/CRM/Utils/versionCheckTest.php | 2 -- tests/phpunit/Civi/API/KernelTest.php | 2 -- tests/phpunit/Civi/API/RequestTest.php | 2 -- .../Subscriber/DynamicFKAuthorizationTest.php | 2 -- .../Subscriber/TransactionSubscriberTest.php | 2 -- .../Subscriber/WhitelistSubscriberTest.php | 2 -- .../ActionSchedule/AbstractMappingTest.php | 2 -- tests/phpunit/Civi/Angular/ManagerTest.php | 2 -- tests/phpunit/Civi/Core/ResolverTest.php | 1 - .../phpunit/Civi/Core/SettingsManagerTest.php | 2 -- .../phpunit/Civi/Token/TokenProcessorTest.php | 2 -- tests/phpunit/CiviTest/CiviCaseTestCase.php | 2 -- tests/phpunit/CiviTest/CiviReportTestCase.php | 2 -- tests/phpunit/WebTest/Utils/RedirectTest.php | 9 ------- tests/phpunit/api/v3/ACLCachingTest.php | 2 -- tests/phpunit/api/v3/ACLPermissionTest.php | 2 -- tests/phpunit/api/v3/APITest.php | 3 --- tests/phpunit/api/v3/APIWrapperTest.php | 2 -- tests/phpunit/api/v3/ActionScheduleTest.php | 2 -- tests/phpunit/api/v3/ActivityContactTest.php | 3 --- tests/phpunit/api/v3/ActivityTest.php | 2 -- tests/phpunit/api/v3/ActivityTypeTest.php | 2 -- tests/phpunit/api/v3/AddressTest.php | 2 -- tests/phpunit/api/v3/AttachmentTest.php | 6 ----- tests/phpunit/api/v3/BatchTest.php | 2 -- tests/phpunit/api/v3/CRM11793Test.php | 2 -- tests/phpunit/api/v3/CampaignTest.php | 3 --- tests/phpunit/api/v3/ConstantTest.php | 5 ---- tests/phpunit/api/v3/ContactTest.php | 6 ----- tests/phpunit/api/v3/ContactTypeTest.php | 3 --- tests/phpunit/api/v3/ContributionPageTest.php | 3 --- .../phpunit/api/v3/ContributionRecurTest.php | 3 --- tests/phpunit/api/v3/ContributionSoftTest.php | 2 -- tests/phpunit/api/v3/ContributionTest.php | 4 --- tests/phpunit/api/v3/CountryTest.php | 4 --- tests/phpunit/api/v3/CustomFieldTest.php | 8 ------ tests/phpunit/api/v3/CustomGroupTest.php | 3 --- tests/phpunit/api/v3/CustomSearchTest.php | 2 -- .../api/v3/CustomValueContactTypeTest.php | 2 -- tests/phpunit/api/v3/CustomValueTest.php | 2 -- tests/phpunit/api/v3/DashboardContactTest.php | 5 ---- tests/phpunit/api/v3/DashboardTest.php | 5 ---- tests/phpunit/api/v3/DomainTest.php | 2 -- tests/phpunit/api/v3/EmailTest.php | 2 -- tests/phpunit/api/v3/EntityBatchTest.php | 3 --- tests/phpunit/api/v3/EntityJoinTest.php | 2 -- tests/phpunit/api/v3/EntityTagACLTest.php | 2 -- tests/phpunit/api/v3/EntityTagTest.php | 2 -- tests/phpunit/api/v3/EventTest.php | 3 --- tests/phpunit/api/v3/GrantTest.php | 3 --- tests/phpunit/api/v3/GroupContactTest.php | 3 --- tests/phpunit/api/v3/GroupNestingTest.php | 3 --- .../phpunit/api/v3/GroupOrganizationTest.php | 3 --- tests/phpunit/api/v3/GroupTest.php | 2 -- tests/phpunit/api/v3/ImTest.php | 3 --- .../phpunit/api/v3/JobProcessMailingTest.php | 2 +- tests/phpunit/api/v3/JobTest.php | 1 - tests/phpunit/api/v3/LineItemTest.php | 2 -- tests/phpunit/api/v3/LocBlockTest.php | 2 -- tests/phpunit/api/v3/MailSettingsTest.php | 2 -- tests/phpunit/api/v3/MailingABTest.php | 3 --- tests/phpunit/api/v3/MailingContactTest.php | 1 - tests/phpunit/api/v3/MailingGroupTest.php | 2 -- tests/phpunit/api/v3/MailingTest.php | 2 -- tests/phpunit/api/v3/MappingFieldTest.php | 3 --- tests/phpunit/api/v3/MappingTest.php | 3 --- .../phpunit/api/v3/MembershipPaymentTest.php | 2 -- tests/phpunit/api/v3/MembershipStatusTest.php | 2 -- tests/phpunit/api/v3/MembershipTest.php | 2 -- tests/phpunit/api/v3/MembershipTypeTest.php | 2 -- tests/phpunit/api/v3/MessageTemplateTest.php | 2 -- tests/phpunit/api/v3/NavigationTest.php | 2 -- tests/phpunit/api/v3/NoteTest.php | 2 -- tests/phpunit/api/v3/OpenIDTest.php | 3 --- tests/phpunit/api/v3/OptionGroupTest.php | 2 -- tests/phpunit/api/v3/OptionValueTest.php | 2 -- tests/phpunit/api/v3/OrderTest.php | 3 --- .../phpunit/api/v3/ParticipantPaymentTest.php | 3 --- .../api/v3/ParticipantStatusTypeTest.php | 2 -- tests/phpunit/api/v3/ParticipantTest.php | 4 +-- tests/phpunit/api/v3/PaymentProcessorTest.php | 2 -- .../api/v3/PaymentProcessorTypeTest.php | 2 -- tests/phpunit/api/v3/PaymentTest.php | 3 --- tests/phpunit/api/v3/PaymentTokenTest.php | 3 --- tests/phpunit/api/v3/PhoneTest.php | 4 --- tests/phpunit/api/v3/PledgePaymentTest.php | 2 -- tests/phpunit/api/v3/PledgeTest.php | 2 -- tests/phpunit/api/v3/PriceFieldTest.php | 2 -- tests/phpunit/api/v3/PriceFieldValueTest.php | 2 -- tests/phpunit/api/v3/PriceSetTest.php | 2 -- tests/phpunit/api/v3/ProductTest.php | 2 -- tests/phpunit/api/v3/ProfileTest.php | 5 ---- tests/phpunit/api/v3/RelationshipTest.php | 2 -- tests/phpunit/api/v3/RelationshipTypeTest.php | 2 -- tests/phpunit/api/v3/ReportTemplateTest.php | 3 --- tests/phpunit/api/v3/SavedSearchTest.php | 2 -- tests/phpunit/api/v3/SelectQueryTest.php | 2 -- tests/phpunit/api/v3/SettingTest.php | 3 --- tests/phpunit/api/v3/StatusPreferenceTest.php | 4 --- tests/phpunit/api/v3/SurveyRespondantTest.php | 2 -- tests/phpunit/api/v3/SurveyTest.php | 5 ---- .../phpunit/api/v3/SyntaxConformanceTest.php | 5 ---- tests/phpunit/api/v3/SystemCheckTest.php | 4 --- tests/phpunit/api/v3/SystemTest.php | 2 -- tests/phpunit/api/v3/TagTest.php | 3 --- .../api/v3/TaxContributionPageTest.php | 2 -- tests/phpunit/api/v3/UFFieldTest.php | 3 --- tests/phpunit/api/v3/UFGroupTest.php | 2 -- tests/phpunit/api/v3/UFJoinTest.php | 3 --- tests/phpunit/api/v3/UFMatchTest.php | 3 --- tests/phpunit/api/v3/UserTest.php | 3 --- tests/phpunit/api/v3/UtilsTest.php | 2 -- tests/phpunit/api/v3/WebsiteTest.php | 3 --- 263 files changed, 32 insertions(+), 644 deletions(-) diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityAssignmentTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityAssignmentTest.php index d03b24688a..af64403ee6 100644 --- a/tests/phpunit/CRM/Activity/BAO/ActivityAssignmentTest.php +++ b/tests/phpunit/CRM/Activity/BAO/ActivityAssignmentTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for CRM_Activity_BAO_ActivityAssignment BAO * diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTargetTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTargetTest.php index 3b4e5881ff..3f1d49dda2 100644 --- a/tests/phpunit/CRM/Activity/BAO/ActivityTargetTest.php +++ b/tests/phpunit/CRM/Activity/BAO/ActivityTargetTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for CRM_Activity_BAO_ActivityTarget BAO * diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php index d5f663a644..f689a502ee 100644 --- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php +++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php @@ -1,5 +1,5 @@ . */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test CRM/Member/BAO Membership Log add , delete functions * diff --git a/tests/phpunit/CRM/Bridge/OG/DrupalTest.php b/tests/phpunit/CRM/Bridge/OG/DrupalTest.php index 6c14115420..ad8ff14a11 100644 --- a/tests/phpunit/CRM/Bridge/OG/DrupalTest.php +++ b/tests/phpunit/CRM/Bridge/OG/DrupalTest.php @@ -31,7 +31,7 @@ /** * Include parent class definition */ -require_once 'CiviTest/CiviUnitTestCase.php'; + require_once 'api/api.php'; /** diff --git a/tests/phpunit/CRM/Case/BAO/CaseTest.php b/tests/phpunit/CRM/Case/BAO/CaseTest.php index 66fd5fce6a..d6f4cd5675 100644 --- a/tests/phpunit/CRM/Case/BAO/CaseTest.php +++ b/tests/phpunit/CRM/Case/BAO/CaseTest.php @@ -1,5 +1,4 @@ assertEquals(45, $lineItem['line_total']); } - /** * Get parameters for credit card submit calls. * diff --git a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php index c33d9eb3db..ba74c872e8 100755 --- a/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php +++ b/tests/phpunit/CRM/Core/BAO/ActionScheduleTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class CRM_Core_BAO_ActionScheduleTest */ diff --git a/tests/phpunit/CRM/Core/BAO/AddressTest.php b/tests/phpunit/CRM/Core/BAO/AddressTest.php index 18b917b5bc..26c408916c 100644 --- a/tests/phpunit/CRM/Core/BAO/AddressTest.php +++ b/tests/phpunit/CRM/Core/BAO/AddressTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/Contact.php'; - /** * Class CRM_Core_BAO_AddressTest */ diff --git a/tests/phpunit/CRM/Core/BAO/ConfigSettingTest.php b/tests/phpunit/CRM/Core/BAO/ConfigSettingTest.php index 1768db1515..5b3f905270 100644 --- a/tests/phpunit/CRM/Core/BAO/ConfigSettingTest.php +++ b/tests/phpunit/CRM/Core/BAO/ConfigSettingTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class CiviReportTestCase */ diff --git a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php index f808556692..89868f69d1 100644 --- a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php +++ b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php @@ -1,5 +1,5 @@ assertEquals($expectSql, $actualSql); } - // CASE: Two params where the %2 is already present in the query - // NOTE: This case should rightly FAIL, as using strstr in the replace mechanism will turn - // the query into: SELECT * FROM whatever WHERE name = 'Alice' AND title = 'Bob' AND year LIKE ''Bob'012' - // So, to avoid such ERROR, the query should be framed like: - // 'SELECT * FROM whatever WHERE name = %1 AND title = %3 AND year LIKE '%2012' - // $params[3] = array('Bob', 'String'); - // i.e. the place holder should be unique and should not contain in any other operational use in query + /** + * CASE: Two params where the %2 is already present in the query + * NOTE: This case should rightly FAIL, as using strstr in the replace mechanism will turn + * the query into: SELECT * FROM whatever WHERE name = 'Alice' AND title = 'Bob' AND year LIKE ''Bob'012' + * So, to avoid such ERROR, the query should be framed like: + * 'SELECT * FROM whatever WHERE name = %1 AND title = %3 AND year LIKE '%2012' + * $params[3] = array('Bob', 'String'); + * i.e. the place holder should be unique and should not contain in any other operational use in query + */ public function testComposeQueryFailure() { $cases[] = array( 'SELECT * FROM whatever WHERE name = %1 AND title = %2 AND year LIKE \'%2012\' ', @@ -173,25 +173,25 @@ class CRM_Core_DAOTest extends CiviUnitTestCase { 'this is an even longer string which is exactly 60 character', 60, FALSE, - 'this is an even longer string which is exactly 60 character' + 'this is an even longer string which is exactly 60 character', ), array( 'this is an even longer string which is exactly 60 character', 60, TRUE, - 'this is an even longer string which is exactly 60 character' + 'this is an even longer string which is exactly 60 character', ), array( 'this is an even longer string which is a bit more than 60 character', 60, FALSE, - 'this is an even longer string which is a bit more than 60 ch' + 'this is an even longer string which is a bit more than 60 ch', ), array( 'this is an even longer string which is a bit more than 60 character', 60, TRUE, - 'this is an even longer string which is a bit more th_c1cbd519' + 'this is an even longer string which is a bit more th_c1cbd519', ), ); } @@ -223,4 +223,5 @@ class CRM_Core_DAOTest extends CiviUnitTestCase { } $this->assertTrue($exception_thrown); } + } diff --git a/tests/phpunit/CRM/Core/ErrorTest.php b/tests/phpunit/CRM/Core/ErrorTest.php index cf61d9ed13..a1e96f4bab 100644 --- a/tests/phpunit/CRM/Core/ErrorTest.php +++ b/tests/phpunit/CRM/Core/ErrorTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Tests for linking to resource files */ diff --git a/tests/phpunit/CRM/Core/FieldOptionsTest.php b/tests/phpunit/CRM/Core/FieldOptionsTest.php index cfb39739dd..ca3405dcdb 100644 --- a/tests/phpunit/CRM/Core/FieldOptionsTest.php +++ b/tests/phpunit/CRM/Core/FieldOptionsTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Tests for field options */ diff --git a/tests/phpunit/CRM/Core/InnoDBIndexerTest.php b/tests/phpunit/CRM/Core/InnoDBIndexerTest.php index 8db28afb1b..b3439d363a 100644 --- a/tests/phpunit/CRM/Core/InnoDBIndexerTest.php +++ b/tests/phpunit/CRM/Core/InnoDBIndexerTest.php @@ -1,7 +1,5 @@ . */ -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/Contact.php'; -require_once 'CiviTest/Membership.php'; - /** * Test CRM/Member/BAO Membership Log add , delete functions * diff --git a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php index b5242a18bd..00ce862bfd 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class CRM_Member_BAO_MembershipStatusTest */ diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php index 3b20b5b904..f833b33f74 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php @@ -25,14 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/Contact.php'; -require_once 'CiviTest/Custom.php'; -require_once 'CiviTest/ContributionPage.php'; -require_once 'CiviTest/Membership.php'; -require_once 'CRM/Core/Controller.php'; - /** * Class CRM_Member_BAO_MembershipTest */ diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php index 65b374d1aa..dd1d3319d8 100644 --- a/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php +++ b/tests/phpunit/CRM/Member/BAO/MembershipTypeTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class CRM_Member_BAO_MembershipTypeTest */ diff --git a/tests/phpunit/CRM/Member/BAO/QueryTest.php b/tests/phpunit/CRM/Member/BAO/QueryTest.php index 84a5270e91..34300892ee 100644 --- a/tests/phpunit/CRM/Member/BAO/QueryTest.php +++ b/tests/phpunit/CRM/Member/BAO/QueryTest.php @@ -1,5 +1,5 @@ (801) 534-1262 */ -/** - * Include class definitions - */ -require_once 'CiviTest/CiviUnitTestCase.php'; - -require_once 'HTML/QuickForm/Page.php'; - /** * Test CRM_Member_Form_Membership functions. * diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php index 242cb48cff..903ac74f9c 100644 --- a/tests/phpunit/CRM/Member/Form/MembershipTest.php +++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php @@ -33,14 +33,6 @@ * @author Walt Haas (801) 534-1262 */ -/** - * Include class definitions - */ -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/CiviMailUtils.php'; - -require_once 'HTML/QuickForm/Page.php'; - /** * Test CRM_Member_Form_Membership functions. * diff --git a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php index 3d3f7f8a47..8f67a33a14 100644 --- a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php +++ b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php @@ -24,10 +24,6 @@ * . */ -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/Contact.php'; -require_once 'CiviTest/Membership.php'; - /** * Test CRM/Member/BAO Membership Log add , delete functions * diff --git a/tests/phpunit/CRM/PCP/BAO/PCPTest.php b/tests/phpunit/CRM/PCP/BAO/PCPTest.php index 7674748d25..ba2e4f3c3b 100644 --- a/tests/phpunit/CRM/PCP/BAO/PCPTest.php +++ b/tests/phpunit/CRM/PCP/BAO/PCPTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for CRM_PCP_BAO_PCPTest BAO * diff --git a/tests/phpunit/CRM/Pledge/BAO/PledgeBlockTest.php b/tests/phpunit/CRM/Pledge/BAO/PledgeBlockTest.php index 292df8ccda..889b5f1155 100644 --- a/tests/phpunit/CRM/Pledge/BAO/PledgeBlockTest.php +++ b/tests/phpunit/CRM/Pledge/BAO/PledgeBlockTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/ContributionPage.php'; - /** * Test class for CRM_Pledge_BAO_PledgeBlock BAO * diff --git a/tests/phpunit/CRM/Pledge/BAO/PledgePaymentTest.php b/tests/phpunit/CRM/Pledge/BAO/PledgePaymentTest.php index 91d1e4b6af..019a36ba50 100644 --- a/tests/phpunit/CRM/Pledge/BAO/PledgePaymentTest.php +++ b/tests/phpunit/CRM/Pledge/BAO/PledgePaymentTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for CRM_Pledge_BAO_PledgePayment BAO * diff --git a/tests/phpunit/CRM/Pledge/BAO/PledgeTest.php b/tests/phpunit/CRM/Pledge/BAO/PledgeTest.php index a4e0646a01..2dcf9b2d50 100644 --- a/tests/phpunit/CRM/Pledge/BAO/PledgeTest.php +++ b/tests/phpunit/CRM/Pledge/BAO/PledgeTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/Contact.php'; - /** * Test class for CRM_Pledge_BAO_Pledge BAO * diff --git a/tests/phpunit/CRM/Price/BAO/PriceSetTest.php b/tests/phpunit/CRM/Price/BAO/PriceSetTest.php index b751056ae3..d03c7173b0 100644 --- a/tests/phpunit/CRM/Price/BAO/PriceSetTest.php +++ b/tests/phpunit/CRM/Price/BAO/PriceSetTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for CRM_Price_BAO_PriceSet. */ diff --git a/tests/phpunit/CRM/Queue/Queue/SqlTest.php b/tests/phpunit/CRM/Queue/Queue/SqlTest.php index f93414d603..f46cf7eac2 100644 --- a/tests/phpunit/CRM/Queue/Queue/SqlTest.php +++ b/tests/phpunit/CRM/Queue/Queue/SqlTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Ensure that the extended interface for SQL-backed queues * work. For example, the createItem() interface supports diff --git a/tests/phpunit/CRM/Queue/QueueTest.php b/tests/phpunit/CRM/Queue/QueueTest.php index 09c9c5c900..8a79b16e00 100644 --- a/tests/phpunit/CRM/Queue/QueueTest.php +++ b/tests/phpunit/CRM/Queue/QueueTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Ensure that various queue implementations comply with the interface */ diff --git a/tests/phpunit/CRM/Queue/RunnerTest.php b/tests/phpunit/CRM/Queue/RunnerTest.php index 6394d2ac13..b205301278 100644 --- a/tests/phpunit/CRM/Queue/RunnerTest.php +++ b/tests/phpunit/CRM/Queue/RunnerTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Ensure that various queue implementations comply with the interface */ diff --git a/tests/phpunit/CRM/UF/Page/ProfileEditorTest.php b/tests/phpunit/CRM/UF/Page/ProfileEditorTest.php index 353646874a..38d16f1d61 100644 --- a/tests/phpunit/CRM/UF/Page/ProfileEditorTest.php +++ b/tests/phpunit/CRM/UF/Page/ProfileEditorTest.php @@ -1,5 +1,4 @@ settings = new CiviSeleniumSettings(); if (property_exists($this->settings, 'serverStartupTimeOut') && $this->settings->serverStartupTimeOut) { global $CiviSeleniumTestCase_polled; diff --git a/tests/phpunit/api/v3/ACLCachingTest.php b/tests/phpunit/api/v3/ACLCachingTest.php index d34dbaa568..cbf005bfc5 100644 --- a/tests/phpunit/api/v3/ACLCachingTest.php +++ b/tests/phpunit/api/v3/ACLCachingTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * This class is intended to test ACL permission using the multisite module * diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php index 42a32aa7e4..b79142ba2b 100644 --- a/tests/phpunit/api/v3/ACLPermissionTest.php +++ b/tests/phpunit/api/v3/ACLPermissionTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * This class is intended to test ACL permission using the multisite module * diff --git a/tests/phpunit/api/v3/APITest.php b/tests/phpunit/api/v3/APITest.php index f147d788a1..e75201cddc 100644 --- a/tests/phpunit/api/v3/APITest.php +++ b/tests/phpunit/api/v3/APITest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for API functions. * diff --git a/tests/phpunit/api/v3/APIWrapperTest.php b/tests/phpunit/api/v3/APIWrapperTest.php index 46874bd186..e8030e94b7 100644 --- a/tests/phpunit/api/v3/APIWrapperTest.php +++ b/tests/phpunit/api/v3/APIWrapperTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; require_once 'api/Wrapper.php'; /** diff --git a/tests/phpunit/api/v3/ActionScheduleTest.php b/tests/phpunit/api/v3/ActionScheduleTest.php index 29973732b5..58e3b9793b 100644 --- a/tests/phpunit/api/v3/ActionScheduleTest.php +++ b/tests/phpunit/api/v3/ActionScheduleTest.php @@ -23,8 +23,6 @@ /** * Include class definitions */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_action_schedule functions diff --git a/tests/phpunit/api/v3/ActivityContactTest.php b/tests/phpunit/api/v3/ActivityContactTest.php index 6e3350126d..64057515fc 100644 --- a/tests/phpunit/api/v3/ActivityContactTest.php +++ b/tests/phpunit/api/v3/ActivityContactTest.php @@ -26,9 +26,6 @@ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_activity_contact* functions * diff --git a/tests/phpunit/api/v3/ActivityTest.php b/tests/phpunit/api/v3/ActivityTest.php index 39bc0a4a36..9fb69e3741 100644 --- a/tests/phpunit/api/v3/ActivityTest.php +++ b/tests/phpunit/api/v3/ActivityTest.php @@ -32,8 +32,6 @@ /** * Include class definitions */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_activity_* functions diff --git a/tests/phpunit/api/v3/ActivityTypeTest.php b/tests/phpunit/api/v3/ActivityTypeTest.php index bf9af844b8..632e3f503c 100644 --- a/tests/phpunit/api/v3/ActivityTypeTest.php +++ b/tests/phpunit/api/v3/ActivityTypeTest.php @@ -24,8 +24,6 @@ * . */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_activity_* functions * diff --git a/tests/phpunit/api/v3/AddressTest.php b/tests/phpunit/api/v3/AddressTest.php index 6a7c535665..9991a6be09 100644 --- a/tests/phpunit/api/v3/AddressTest.php +++ b/tests/phpunit/api/v3/AddressTest.php @@ -32,8 +32,6 @@ * @subpackage API_Contact */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_AddressTest */ diff --git a/tests/phpunit/api/v3/AttachmentTest.php b/tests/phpunit/api/v3/AttachmentTest.php index ca23a703ca..d623dcd84c 100644 --- a/tests/phpunit/api/v3/AttachmentTest.php +++ b/tests/phpunit/api/v3/AttachmentTest.php @@ -25,12 +25,6 @@ * . */ -/** - * Include class definitions - */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test for the Attachment API * diff --git a/tests/phpunit/api/v3/BatchTest.php b/tests/phpunit/api/v3/BatchTest.php index bf6bac07cc..76c42b444a 100644 --- a/tests/phpunit/api/v3/BatchTest.php +++ b/tests/phpunit/api/v3/BatchTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for Batch API - civicrm_batch_* * diff --git a/tests/phpunit/api/v3/CRM11793Test.php b/tests/phpunit/api/v3/CRM11793Test.php index a30028faf0..bd15adc12b 100644 --- a/tests/phpunit/api/v3/CRM11793Test.php +++ b/tests/phpunit/api/v3/CRM11793Test.php @@ -3,8 +3,6 @@ * File for the CRM11793 issue * Include class definitions */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_activity_* functions diff --git a/tests/phpunit/api/v3/CampaignTest.php b/tests/phpunit/api/v3/CampaignTest.php index 6a34eef1f5..948976b679 100644 --- a/tests/phpunit/api/v3/CampaignTest.php +++ b/tests/phpunit/api/v3/CampaignTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_CampaignTest */ diff --git a/tests/phpunit/api/v3/ConstantTest.php b/tests/phpunit/api/v3/ConstantTest.php index 125ba413f1..ebe6408d6f 100644 --- a/tests/phpunit/api/v3/ConstantTest.php +++ b/tests/phpunit/api/v3/ConstantTest.php @@ -29,11 +29,6 @@ * . */ -/** - * Include class definitions - */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_activity_* functions * diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php index 794ac2d914..12cc54c0eb 100644 --- a/tests/phpunit/api/v3/ContactTest.php +++ b/tests/phpunit/api/v3/ContactTest.php @@ -29,12 +29,6 @@ * . */ -/** - * Include class definitions - */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_contact* functions * diff --git a/tests/phpunit/api/v3/ContactTypeTest.php b/tests/phpunit/api/v3/ContactTypeTest.php index fde8581646..a92f01a888 100644 --- a/tests/phpunit/api/v3/ContactTypeTest.php +++ b/tests/phpunit/api/v3/ContactTypeTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_ContactTypeTest */ diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php index 228c3f8836..89e05871a9 100644 --- a/tests/phpunit/api/v3/ContributionPageTest.php +++ b/tests/phpunit/api/v3/ContributionPageTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/CiviMailUtils.php'; - /** * Test APIv3 civicrm_contribute_recur* functions * diff --git a/tests/phpunit/api/v3/ContributionRecurTest.php b/tests/phpunit/api/v3/ContributionRecurTest.php index 63ad157006..0b38b6b82a 100644 --- a/tests/phpunit/api/v3/ContributionRecurTest.php +++ b/tests/phpunit/api/v3/ContributionRecurTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_contribute_recur* functions * diff --git a/tests/phpunit/api/v3/ContributionSoftTest.php b/tests/phpunit/api/v3/ContributionSoftTest.php index 91e84f90cd..d5f7336cc7 100644 --- a/tests/phpunit/api/v3/ContributionSoftTest.php +++ b/tests/phpunit/api/v3/ContributionSoftTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_contribute_* functions * diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php index 927ee6d853..597b15cf98 100644 --- a/tests/phpunit/api/v3/ContributionTest.php +++ b/tests/phpunit/api/v3/ContributionTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; -require_once 'CiviTest/CiviMailUtils.php'; - - /** * Test APIv3 civicrm_contribute_* functions * diff --git a/tests/phpunit/api/v3/CountryTest.php b/tests/phpunit/api/v3/CountryTest.php index aa27fd4d18..6ac19dbd83 100644 --- a/tests/phpunit/api/v3/CountryTest.php +++ b/tests/phpunit/api/v3/CountryTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_country* functions * diff --git a/tests/phpunit/api/v3/CustomFieldTest.php b/tests/phpunit/api/v3/CustomFieldTest.php index b860d7a64c..595e598fae 100644 --- a/tests/phpunit/api/v3/CustomFieldTest.php +++ b/tests/phpunit/api/v3/CustomFieldTest.php @@ -25,12 +25,6 @@ +--------------------------------------------------------------------+ */ -/** - * Include class definitions - */ -require_once 'tests/phpunit/CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_create_custom_group * @@ -210,7 +204,6 @@ class api_v3_CustomFieldTest extends CiviUnitTestCase { /*function testCustomFieldCreateExample( ) { - $customGroup = $this->customGroupCreate('Individual','date_test_group',3); require_once 'api/v3/examples/CustomField/Create.php'; $result = custom_field_create_example(); @@ -281,7 +274,6 @@ class api_v3_CustomFieldTest extends CiviUnitTestCase { $this->assertEquals($optionGroupID, 3); } - /** * Test custom field get works & return param works */ diff --git a/tests/phpunit/api/v3/CustomGroupTest.php b/tests/phpunit/api/v3/CustomGroupTest.php index bc2a752707..9f1e2fc3d9 100644 --- a/tests/phpunit/api/v3/CustomGroupTest.php +++ b/tests/phpunit/api/v3/CustomGroupTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_custom_group* functions * diff --git a/tests/phpunit/api/v3/CustomSearchTest.php b/tests/phpunit/api/v3/CustomSearchTest.php index 8a18768f85..665746e3b9 100644 --- a/tests/phpunit/api/v3/CustomSearchTest.php +++ b/tests/phpunit/api/v3/CustomSearchTest.php @@ -1,7 +1,5 @@ . */ -/** - * Include class definitions - */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_action_schedule functions * diff --git a/tests/phpunit/api/v3/DashboardTest.php b/tests/phpunit/api/v3/DashboardTest.php index c90a2d2021..4eed8f7ab6 100644 --- a/tests/phpunit/api/v3/DashboardTest.php +++ b/tests/phpunit/api/v3/DashboardTest.php @@ -19,11 +19,6 @@ * . */ -/** - * Include class definitions - */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_action_schedule functions * diff --git a/tests/phpunit/api/v3/DomainTest.php b/tests/phpunit/api/v3/DomainTest.php index 3964dc4f51..d1a6064714 100644 --- a/tests/phpunit/api/v3/DomainTest.php +++ b/tests/phpunit/api/v3/DomainTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for Domain API - civicrm_domain_* * diff --git a/tests/phpunit/api/v3/EmailTest.php b/tests/phpunit/api/v3/EmailTest.php index b34f0f0b5e..169b080ef0 100644 --- a/tests/phpunit/api/v3/EmailTest.php +++ b/tests/phpunit/api/v3/EmailTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_EmailTest */ diff --git a/tests/phpunit/api/v3/EntityBatchTest.php b/tests/phpunit/api/v3/EntityBatchTest.php index e429c0ee45..75a3c908f2 100644 --- a/tests/phpunit/api/v3/EntityBatchTest.php +++ b/tests/phpunit/api/v3/EntityBatchTest.php @@ -25,9 +25,6 @@ -------------------------------------------------------------------- */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_entity_batch_* functions * diff --git a/tests/phpunit/api/v3/EntityJoinTest.php b/tests/phpunit/api/v3/EntityJoinTest.php index 4b596f6d48..c83a5a728e 100644 --- a/tests/phpunit/api/v3/EntityJoinTest.php +++ b/tests/phpunit/api/v3/EntityJoinTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 ability to join across multiple entities * diff --git a/tests/phpunit/api/v3/EntityTagACLTest.php b/tests/phpunit/api/v3/EntityTagACLTest.php index 160b3db751..425b11db51 100644 --- a/tests/phpunit/api/v3/EntityTagACLTest.php +++ b/tests/phpunit/api/v3/EntityTagACLTest.php @@ -32,8 +32,6 @@ * @subpackage API_Core */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_EntityTagTest. * diff --git a/tests/phpunit/api/v3/EntityTagTest.php b/tests/phpunit/api/v3/EntityTagTest.php index b2dec522c9..23dcd9eb2a 100644 --- a/tests/phpunit/api/v3/EntityTagTest.php +++ b/tests/phpunit/api/v3/EntityTagTest.php @@ -32,8 +32,6 @@ * @subpackage API_Core */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_EntityTagTest. */ diff --git a/tests/phpunit/api/v3/EventTest.php b/tests/phpunit/api/v3/EventTest.php index 7560a5087e..955ecdfdb4 100644 --- a/tests/phpunit/api/v3/EventTest.php +++ b/tests/phpunit/api/v3/EventTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_EventTest */ diff --git a/tests/phpunit/api/v3/GrantTest.php b/tests/phpunit/api/v3/GrantTest.php index ecfaedf1b8..fb33eb8ad3 100644 --- a/tests/phpunit/api/v3/GrantTest.php +++ b/tests/phpunit/api/v3/GrantTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_grant* functions * diff --git a/tests/phpunit/api/v3/GroupContactTest.php b/tests/phpunit/api/v3/GroupContactTest.php index d611195a42..61808908b9 100644 --- a/tests/phpunit/api/v3/GroupContactTest.php +++ b/tests/phpunit/api/v3/GroupContactTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_GroupContactTest */ diff --git a/tests/phpunit/api/v3/GroupNestingTest.php b/tests/phpunit/api/v3/GroupNestingTest.php index 53c0345635..8bd9910178 100644 --- a/tests/phpunit/api/v3/GroupNestingTest.php +++ b/tests/phpunit/api/v3/GroupNestingTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for GroupNesting API - civicrm_group_nesting_* * diff --git a/tests/phpunit/api/v3/GroupOrganizationTest.php b/tests/phpunit/api/v3/GroupOrganizationTest.php index fa3e841a35..72ab146874 100644 --- a/tests/phpunit/api/v3/GroupOrganizationTest.php +++ b/tests/phpunit/api/v3/GroupOrganizationTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test class for GroupOrganization API - civicrm_group_organization_* * diff --git a/tests/phpunit/api/v3/GroupTest.php b/tests/phpunit/api/v3/GroupTest.php index cae4b15a5c..a3bf0d028a 100644 --- a/tests/phpunit/api/v3/GroupTest.php +++ b/tests/phpunit/api/v3/GroupTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for Group API - civicrm_group_* * diff --git a/tests/phpunit/api/v3/ImTest.php b/tests/phpunit/api/v3/ImTest.php index e15881d6e1..d54198a7af 100644 --- a/tests/phpunit/api/v3/ImTest.php +++ b/tests/phpunit/api/v3/ImTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_im_* functions * diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php index de91bcb1eb..8bc50f9aba 100644 --- a/tests/phpunit/api/v3/JobProcessMailingTest.php +++ b/tests/phpunit/api/v3/JobProcessMailingTest.php @@ -35,7 +35,7 @@ * @version $Id: Job.php 30879 2010-11-22 15:45:55Z shot $ * */ -require_once 'CiviTest/CiviUnitTestCase.php'; + //@todo - why doesn't class loader find these (I tried renaming) require_once 'CiviTest/CiviMailUtils.php'; diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php index d6e583e96d..245f17627f 100644 --- a/tests/phpunit/api/v3/JobTest.php +++ b/tests/phpunit/api/v3/JobTest.php @@ -35,7 +35,6 @@ * @version $Id: Job.php 30879 2010-11-22 15:45:55Z shot $ * */ -require_once 'CiviTest/CiviUnitTestCase.php'; /** * Class api_v3_JobTest diff --git a/tests/phpunit/api/v3/LineItemTest.php b/tests/phpunit/api/v3/LineItemTest.php index 28eb6c9417..96346495bd 100644 --- a/tests/phpunit/api/v3/LineItemTest.php +++ b/tests/phpunit/api/v3/LineItemTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_LineItemTest */ diff --git a/tests/phpunit/api/v3/LocBlockTest.php b/tests/phpunit/api/v3/LocBlockTest.php index 8fbbfd6ae1..cdded66d50 100644 --- a/tests/phpunit/api/v3/LocBlockTest.php +++ b/tests/phpunit/api/v3/LocBlockTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_LocBlockTest */ diff --git a/tests/phpunit/api/v3/MailSettingsTest.php b/tests/phpunit/api/v3/MailSettingsTest.php index 9ca2958867..3d278c14a5 100644 --- a/tests/phpunit/api/v3/MailSettingsTest.php +++ b/tests/phpunit/api/v3/MailSettingsTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_MailSettingsTest */ diff --git a/tests/phpunit/api/v3/MailingABTest.php b/tests/phpunit/api/v3/MailingABTest.php index e0dc8a4396..6d2eabd837 100755 --- a/tests/phpunit/api/v3/MailingABTest.php +++ b/tests/phpunit/api/v3/MailingABTest.php @@ -23,9 +23,6 @@ * . */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_mailingab_* functions * diff --git a/tests/phpunit/api/v3/MailingContactTest.php b/tests/phpunit/api/v3/MailingContactTest.php index e912a771cd..1a2f86dc2e 100644 --- a/tests/phpunit/api/v3/MailingContactTest.php +++ b/tests/phpunit/api/v3/MailingContactTest.php @@ -34,7 +34,6 @@ * @copyright CiviCRM LLC (c) 2004-2015 * @version $Id: Job.php 30879 2010-11-22 15:45:55Z shot $ */ -require_once 'CiviTest/CiviUnitTestCase.php'; /** * Class api_v3_MailingContactTest diff --git a/tests/phpunit/api/v3/MailingGroupTest.php b/tests/phpunit/api/v3/MailingGroupTest.php index 6954b9a626..63375d5ff3 100644 --- a/tests/phpunit/api/v3/MailingGroupTest.php +++ b/tests/phpunit/api/v3/MailingGroupTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_mailing_group_* functions * diff --git a/tests/phpunit/api/v3/MailingTest.php b/tests/phpunit/api/v3/MailingTest.php index ca57d4a732..fc110bee8c 100755 --- a/tests/phpunit/api/v3/MailingTest.php +++ b/tests/phpunit/api/v3/MailingTest.php @@ -23,8 +23,6 @@ * . */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_mailing_* functions diff --git a/tests/phpunit/api/v3/MappingFieldTest.php b/tests/phpunit/api/v3/MappingFieldTest.php index b83e5d8588..85e070858e 100644 --- a/tests/phpunit/api/v3/MappingFieldTest.php +++ b/tests/phpunit/api/v3/MappingFieldTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_mapping_field_* functions * diff --git a/tests/phpunit/api/v3/MappingTest.php b/tests/phpunit/api/v3/MappingTest.php index f1865fb070..9adbb5a9d2 100644 --- a/tests/phpunit/api/v3/MappingTest.php +++ b/tests/phpunit/api/v3/MappingTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_mapping_* functions * diff --git a/tests/phpunit/api/v3/MembershipPaymentTest.php b/tests/phpunit/api/v3/MembershipPaymentTest.php index 19b3882455..ab1e4c0128 100644 --- a/tests/phpunit/api/v3/MembershipPaymentTest.php +++ b/tests/phpunit/api/v3/MembershipPaymentTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_membership_payment* functions * diff --git a/tests/phpunit/api/v3/MembershipStatusTest.php b/tests/phpunit/api/v3/MembershipStatusTest.php index d0c6092878..27429057c4 100644 --- a/tests/phpunit/api/v3/MembershipStatusTest.php +++ b/tests/phpunit/api/v3/MembershipStatusTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_MembershipStatusTest */ diff --git a/tests/phpunit/api/v3/MembershipTest.php b/tests/phpunit/api/v3/MembershipTest.php index 3f5176c083..4bee09b7b1 100644 --- a/tests/phpunit/api/v3/MembershipTest.php +++ b/tests/phpunit/api/v3/MembershipTest.php @@ -32,8 +32,6 @@ * @subpackage API_Member */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_MembershipTest */ diff --git a/tests/phpunit/api/v3/MembershipTypeTest.php b/tests/phpunit/api/v3/MembershipTypeTest.php index b251786d3b..98d33689c8 100644 --- a/tests/phpunit/api/v3/MembershipTypeTest.php +++ b/tests/phpunit/api/v3/MembershipTypeTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_MembershipTypeTest */ diff --git a/tests/phpunit/api/v3/MessageTemplateTest.php b/tests/phpunit/api/v3/MessageTemplateTest.php index acc0e58927..4de6a4d397 100644 --- a/tests/phpunit/api/v3/MessageTemplateTest.php +++ b/tests/phpunit/api/v3/MessageTemplateTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for Template API - civicrm_msg_template* * diff --git a/tests/phpunit/api/v3/NavigationTest.php b/tests/phpunit/api/v3/NavigationTest.php index 3073e2dec4..2f3f6bde5e 100644 --- a/tests/phpunit/api/v3/NavigationTest.php +++ b/tests/phpunit/api/v3/NavigationTest.php @@ -25,8 +25,6 @@ * +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_NavigationTest */ diff --git a/tests/phpunit/api/v3/NoteTest.php b/tests/phpunit/api/v3/NoteTest.php index 6f4fa44927..3b56a22ac3 100644 --- a/tests/phpunit/api/v3/NoteTest.php +++ b/tests/phpunit/api/v3/NoteTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'tests/phpunit/CiviTest/CiviUnitTestCase.php'; - /** * Class contains api test cases for "civicrm_note" */ diff --git a/tests/phpunit/api/v3/OpenIDTest.php b/tests/phpunit/api/v3/OpenIDTest.php index 9d0076e8d0..2ceb617912 100644 --- a/tests/phpunit/api/v3/OpenIDTest.php +++ b/tests/phpunit/api/v3/OpenIDTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_openid_* functions * diff --git a/tests/phpunit/api/v3/OptionGroupTest.php b/tests/phpunit/api/v3/OptionGroupTest.php index 1f30348c97..b226500e47 100644 --- a/tests/phpunit/api/v3/OptionGroupTest.php +++ b/tests/phpunit/api/v3/OptionGroupTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_OptionGroupTest */ diff --git a/tests/phpunit/api/v3/OptionValueTest.php b/tests/phpunit/api/v3/OptionValueTest.php index 39f92ca73f..a036c1b2b8 100644 --- a/tests/phpunit/api/v3/OptionValueTest.php +++ b/tests/phpunit/api/v3/OptionValueTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_OptionValueTest */ diff --git a/tests/phpunit/api/v3/OrderTest.php b/tests/phpunit/api/v3/OrderTest.php index 4585cdd874..2bc6cbe2dd 100644 --- a/tests/phpunit/api/v3/OrderTest.php +++ b/tests/phpunit/api/v3/OrderTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_contribute_* functions * diff --git a/tests/phpunit/api/v3/ParticipantPaymentTest.php b/tests/phpunit/api/v3/ParticipantPaymentTest.php index b11a3ff3ff..54be319825 100644 --- a/tests/phpunit/api/v3/ParticipantPaymentTest.php +++ b/tests/phpunit/api/v3/ParticipantPaymentTest.php @@ -25,9 +25,6 @@ * +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_participant_* functions * diff --git a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php index 477bf8373b..9ad377ac25 100644 --- a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php +++ b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_ParticipantStatusTypeTest */ diff --git a/tests/phpunit/api/v3/ParticipantTest.php b/tests/phpunit/api/v3/ParticipantTest.php index cf539595dc..7ef1f38298 100644 --- a/tests/phpunit/api/v3/ParticipantTest.php +++ b/tests/phpunit/api/v3/ParticipantTest.php @@ -25,15 +25,13 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for Batch API - civicrm_participant_* * * @package CiviCRM_APIv3 */ require_once 'CRM/Utils/DeprecatedUtils.php'; -require_once 'CiviTest/CiviUnitTestCase.php'; + /** * Class api_v3_ParticipantTest diff --git a/tests/phpunit/api/v3/PaymentProcessorTest.php b/tests/phpunit/api/v3/PaymentProcessorTest.php index a4649bc37c..f2bc62e706 100644 --- a/tests/phpunit/api/v3/PaymentProcessorTest.php +++ b/tests/phpunit/api/v3/PaymentProcessorTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class contains api test cases for "civicrm_payment_processor" * diff --git a/tests/phpunit/api/v3/PaymentProcessorTypeTest.php b/tests/phpunit/api/v3/PaymentProcessorTypeTest.php index e8379a470d..04349e584b 100644 --- a/tests/phpunit/api/v3/PaymentProcessorTypeTest.php +++ b/tests/phpunit/api/v3/PaymentProcessorTypeTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class contains api test cases for "civicrm_payment_processor_type" * diff --git a/tests/phpunit/api/v3/PaymentTest.php b/tests/phpunit/api/v3/PaymentTest.php index 2dc5fa3357..698668a212 100644 --- a/tests/phpunit/api/v3/PaymentTest.php +++ b/tests/phpunit/api/v3/PaymentTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_contribute_* functions * diff --git a/tests/phpunit/api/v3/PaymentTokenTest.php b/tests/phpunit/api/v3/PaymentTokenTest.php index d2b0fbfde8..6d7d4790e7 100644 --- a/tests/phpunit/api/v3/PaymentTokenTest.php +++ b/tests/phpunit/api/v3/PaymentTokenTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_PaymentTokenTest */ diff --git a/tests/phpunit/api/v3/PhoneTest.php b/tests/phpunit/api/v3/PhoneTest.php index 28742fc22c..f6af8424ad 100644 --- a/tests/phpunit/api/v3/PhoneTest.php +++ b/tests/phpunit/api/v3/PhoneTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_phone* functions * diff --git a/tests/phpunit/api/v3/PledgePaymentTest.php b/tests/phpunit/api/v3/PledgePaymentTest.php index 46c6c299bc..f0f70bc39c 100644 --- a/tests/phpunit/api/v3/PledgePaymentTest.php +++ b/tests/phpunit/api/v3/PledgePaymentTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for Pledge API - civicrm_pledge_* * diff --git a/tests/phpunit/api/v3/PledgeTest.php b/tests/phpunit/api/v3/PledgeTest.php index f00e9ad107..0cf185ecb1 100644 --- a/tests/phpunit/api/v3/PledgeTest.php +++ b/tests/phpunit/api/v3/PledgeTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for Pledge API - civicrm_pledge_* * diff --git a/tests/phpunit/api/v3/PriceFieldTest.php b/tests/phpunit/api/v3/PriceFieldTest.php index 3855d22c3e..0a402bce87 100644 --- a/tests/phpunit/api/v3/PriceFieldTest.php +++ b/tests/phpunit/api/v3/PriceFieldTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_PriceFieldTest */ diff --git a/tests/phpunit/api/v3/PriceFieldValueTest.php b/tests/phpunit/api/v3/PriceFieldValueTest.php index b90962337e..7c71f5971b 100644 --- a/tests/phpunit/api/v3/PriceFieldValueTest.php +++ b/tests/phpunit/api/v3/PriceFieldValueTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_PriceFieldValueTest */ diff --git a/tests/phpunit/api/v3/PriceSetTest.php b/tests/phpunit/api/v3/PriceSetTest.php index 099c96f238..4fd0c1d05b 100644 --- a/tests/phpunit/api/v3/PriceSetTest.php +++ b/tests/phpunit/api/v3/PriceSetTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_PriceSetTest */ diff --git a/tests/phpunit/api/v3/ProductTest.php b/tests/phpunit/api/v3/ProductTest.php index 1bbdf833aa..bb0629a7a4 100644 --- a/tests/phpunit/api/v3/ProductTest.php +++ b/tests/phpunit/api/v3/ProductTest.php @@ -25,8 +25,6 @@ * +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_ProductTest */ diff --git a/tests/phpunit/api/v3/ProfileTest.php b/tests/phpunit/api/v3/ProfileTest.php index 4c6e2913e6..c4856522bc 100644 --- a/tests/phpunit/api/v3/ProfileTest.php +++ b/tests/phpunit/api/v3/ProfileTest.php @@ -25,11 +25,6 @@ +--------------------------------------------------------------------+ */ -/** - * Include class definitions - */ -require_once 'tests/phpunit/CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 civicrm_profile_* functions * diff --git a/tests/phpunit/api/v3/RelationshipTest.php b/tests/phpunit/api/v3/RelationshipTest.php index 1446a15430..28b5492731 100644 --- a/tests/phpunit/api/v3/RelationshipTest.php +++ b/tests/phpunit/api/v3/RelationshipTest.php @@ -25,8 +25,6 @@ * +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class contains api test cases for "civicrm_relationship" */ diff --git a/tests/phpunit/api/v3/RelationshipTypeTest.php b/tests/phpunit/api/v3/RelationshipTypeTest.php index b5bf1e55a1..72dbf9c6c9 100644 --- a/tests/phpunit/api/v3/RelationshipTypeTest.php +++ b/tests/phpunit/api/v3/RelationshipTypeTest.php @@ -51,8 +51,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class contains api test cases for "civicrm_relationship_type" * diff --git a/tests/phpunit/api/v3/ReportTemplateTest.php b/tests/phpunit/api/v3/ReportTemplateTest.php index 16f8767421..e7f09ffe48 100644 --- a/tests/phpunit/api/v3/ReportTemplateTest.php +++ b/tests/phpunit/api/v3/ReportTemplateTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_report_instance_* functions * diff --git a/tests/phpunit/api/v3/SavedSearchTest.php b/tests/phpunit/api/v3/SavedSearchTest.php index b8fefbbb00..3869017ae0 100644 --- a/tests/phpunit/api/v3/SavedSearchTest.php +++ b/tests/phpunit/api/v3/SavedSearchTest.php @@ -26,8 +26,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_SavedSearchTest * diff --git a/tests/phpunit/api/v3/SelectQueryTest.php b/tests/phpunit/api/v3/SelectQueryTest.php index 16ada5e4d7..8a7761eb41 100644 --- a/tests/phpunit/api/v3/SelectQueryTest.php +++ b/tests/phpunit/api/v3/SelectQueryTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test APIv3 ability to join across multiple entities * diff --git a/tests/phpunit/api/v3/SettingTest.php b/tests/phpunit/api/v3/SettingTest.php index 2cf55cd6e6..d56c320029 100644 --- a/tests/phpunit/api/v3/SettingTest.php +++ b/tests/phpunit/api/v3/SettingTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_setting_* functions * diff --git a/tests/phpunit/api/v3/StatusPreferenceTest.php b/tests/phpunit/api/v3/StatusPreferenceTest.php index 5f7267c384..99578bb4cf 100644 --- a/tests/phpunit/api/v3/StatusPreferenceTest.php +++ b/tests/phpunit/api/v3/StatusPreferenceTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Class api_v3_StatusPreferenceTest * diff --git a/tests/phpunit/api/v3/SurveyRespondantTest.php b/tests/phpunit/api/v3/SurveyRespondantTest.php index d5ad6d64ad..e97528f69e 100644 --- a/tests/phpunit/api/v3/SurveyRespondantTest.php +++ b/tests/phpunit/api/v3/SurveyRespondantTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_SurveyRespondantTest */ diff --git a/tests/phpunit/api/v3/SurveyTest.php b/tests/phpunit/api/v3/SurveyTest.php index 3f7084f015..345528591a 100644 --- a/tests/phpunit/api/v3/SurveyTest.php +++ b/tests/phpunit/api/v3/SurveyTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_survey_* functions * @@ -35,8 +32,6 @@ require_once 'CiviTest/CiviUnitTestCase.php'; * @subpackage API_Campaign */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * All API should contain at minimum a success test for each * function - in this case - create, get & delete diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index 89d7a1d1ba..60613fa63c 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test that the core actions for APIv3 entities comply with standard syntax+behavior. * @@ -404,7 +401,6 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { return $entities; } - /** * At this stage exclude the ones that don't pass & add them as we can troubleshoot them * @param bool $sequential @@ -1509,7 +1505,6 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { return $baos; } - /** * Verify that HTML metacharacters provided as inputs appear consistently. * as outputs. diff --git a/tests/phpunit/api/v3/SystemCheckTest.php b/tests/phpunit/api/v3/SystemCheckTest.php index bc2f878a67..83a24c0e51 100644 --- a/tests/phpunit/api/v3/SystemCheckTest.php +++ b/tests/phpunit/api/v3/SystemCheckTest.php @@ -25,10 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * System.check API has many special test cases, so they have their own class. * diff --git a/tests/phpunit/api/v3/SystemTest.php b/tests/phpunit/api/v3/SystemTest.php index c4ec296aff..139951fce7 100644 --- a/tests/phpunit/api/v3/SystemTest.php +++ b/tests/phpunit/api/v3/SystemTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for System API - civicrm_system_* * diff --git a/tests/phpunit/api/v3/TagTest.php b/tests/phpunit/api/v3/TagTest.php index 366d12df96..1af0b6055c 100644 --- a/tests/phpunit/api/v3/TagTest.php +++ b/tests/phpunit/api/v3/TagTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_tag_* functions * diff --git a/tests/phpunit/api/v3/TaxContributionPageTest.php b/tests/phpunit/api/v3/TaxContributionPageTest.php index 2f3a00845d..5909f85824 100644 --- a/tests/phpunit/api/v3/TaxContributionPageTest.php +++ b/tests/phpunit/api/v3/TaxContributionPageTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Class api_v3_TaxContributionPageTest */ diff --git a/tests/phpunit/api/v3/UFFieldTest.php b/tests/phpunit/api/v3/UFFieldTest.php index ff7da5abc4..6caa2edea2 100644 --- a/tests/phpunit/api/v3/UFFieldTest.php +++ b/tests/phpunit/api/v3/UFFieldTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for UFGroup API - civicrm_uf_* * @todo Split UFGroup and UFJoin tests diff --git a/tests/phpunit/api/v3/UFGroupTest.php b/tests/phpunit/api/v3/UFGroupTest.php index d3ee4adad9..a30cd3a950 100644 --- a/tests/phpunit/api/v3/UFGroupTest.php +++ b/tests/phpunit/api/v3/UFGroupTest.php @@ -25,8 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for UFGroup API - civicrm_uf_* * @todo Split UFGroup and UFJoin tests diff --git a/tests/phpunit/api/v3/UFJoinTest.php b/tests/phpunit/api/v3/UFJoinTest.php index 9d03d4c7b1..bdf6422da4 100644 --- a/tests/phpunit/api/v3/UFJoinTest.php +++ b/tests/phpunit/api/v3/UFJoinTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for UFGroup API - civicrm_uf_* * @todo Split UFGroup and UFJoin tests diff --git a/tests/phpunit/api/v3/UFMatchTest.php b/tests/phpunit/api/v3/UFMatchTest.php index 2f9b9cd450..def9bf832b 100644 --- a/tests/phpunit/api/v3/UFMatchTest.php +++ b/tests/phpunit/api/v3/UFMatchTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ - -require_once 'CiviTest/CiviUnitTestCase.php'; - /** * Test class for UFGroup API - civicrm_uf_* * @todo Split UFGroup and UFJoin tests diff --git a/tests/phpunit/api/v3/UserTest.php b/tests/phpunit/api/v3/UserTest.php index be71404c02..eda4502f3f 100644 --- a/tests/phpunit/api/v3/UserTest.php +++ b/tests/phpunit/api/v3/UserTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_website_* functions * diff --git a/tests/phpunit/api/v3/UtilsTest.php b/tests/phpunit/api/v3/UtilsTest.php index b181d90280..595a17f818 100644 --- a/tests/phpunit/api/v3/UtilsTest.php +++ b/tests/phpunit/api/v3/UtilsTest.php @@ -25,7 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; require_once 'CRM/Utils/DeprecatedUtils.php'; /** @@ -201,7 +200,6 @@ class api_v3_UtilsTest extends CiviUnitTestCase { } } - /** * Test GET DAO function returns DAO. */ diff --git a/tests/phpunit/api/v3/WebsiteTest.php b/tests/phpunit/api/v3/WebsiteTest.php index de75c525d9..edce6b7e88 100644 --- a/tests/phpunit/api/v3/WebsiteTest.php +++ b/tests/phpunit/api/v3/WebsiteTest.php @@ -25,9 +25,6 @@ +--------------------------------------------------------------------+ */ -require_once 'CiviTest/CiviUnitTestCase.php'; - - /** * Test APIv3 civicrm_website_* functions * -- 2.25.1