From b7c9bc4c1434185dd7b9e5c92a399adaa6c18d2e Mon Sep 17 00:00:00 2001 From: Eileen Date: Fri, 3 Jan 2014 19:57:28 +1300 Subject: [PATCH] remove references to E-NoticeCompliance - is now required not optional --- tests/phpunit/api/v3/ACLCachingTest.php | 2 +- tests/phpunit/api/v3/ACLPermissionTest.php | 2 +- tests/phpunit/api/v3/APITest.php | 2 +- tests/phpunit/api/v3/APIWrapperTest.php | 2 +- tests/phpunit/api/v3/ActionScheduleTest.php | 2 +- tests/phpunit/api/v3/ActivityTypeTest.php | 2 +- tests/phpunit/api/v3/AddressTest.php | 2 +- tests/phpunit/api/v3/BatchTest.php | 2 +- tests/phpunit/api/v3/CampaignTest.php | 2 +- tests/phpunit/api/v3/CaseTest.php | 2 +- tests/phpunit/api/v3/ConstantTest.php | 2 +- tests/phpunit/api/v3/ContactTest.php | 2 +- tests/phpunit/api/v3/ContactTypeTest.php | 2 +- tests/phpunit/api/v3/ContributionPageTest.php | 2 +- tests/phpunit/api/v3/ContributionRecurTest.php | 2 +- tests/phpunit/api/v3/ContributionSoftTest.php | 2 +- tests/phpunit/api/v3/ContributionTest.php | 2 +- tests/phpunit/api/v3/CustomFieldTest.php | 2 +- tests/phpunit/api/v3/CustomGroupTest.php | 2 +- tests/phpunit/api/v3/CustomSearchTest.php | 2 +- tests/phpunit/api/v3/CustomValueContactTypeTest.php | 2 +- tests/phpunit/api/v3/CustomValueTest.php | 2 +- tests/phpunit/api/v3/DomainTest.php | 2 +- tests/phpunit/api/v3/EmailTest.php | 2 +- tests/phpunit/api/v3/EntityTagTest.php | 2 +- tests/phpunit/api/v3/EventTest.php | 2 +- tests/phpunit/api/v3/GrantTest.php | 2 +- tests/phpunit/api/v3/GroupContactTest.php | 1 - tests/phpunit/api/v3/GroupNestingTest.php | 1 - tests/phpunit/api/v3/GroupOrganizationTest.php | 1 - tests/phpunit/api/v3/ImTest.php | 2 +- tests/phpunit/api/v3/JobTest.php | 2 +- tests/phpunit/api/v3/LineItemTest.php | 2 +- tests/phpunit/api/v3/LocBlockTest.php | 2 +- tests/phpunit/api/v3/MailingGroupTest.php | 2 +- tests/phpunit/api/v3/MailingTest.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/NoteTest.php | 2 +- tests/phpunit/api/v3/OptionGroupTest.php | 2 +- tests/phpunit/api/v3/OptionValueTest.php | 2 +- tests/phpunit/api/v3/ParticipantPaymentTest.php | 2 +- tests/phpunit/api/v3/ParticipantStatusTypeTest.php | 2 +- tests/phpunit/api/v3/PaymentProcessorTest.php | 2 +- tests/phpunit/api/v3/PaymentProcessorTypeTest.php | 2 +- tests/phpunit/api/v3/PhoneTest.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/RelationshipTest.php | 2 +- tests/phpunit/api/v3/RelationshipTypeTest.php | 2 +- tests/phpunit/api/v3/ReportTemplateTest.php | 2 +- tests/phpunit/api/v3/SettingTest.php | 2 +- tests/phpunit/api/v3/SurveyRespondantTest.php | 2 +- tests/phpunit/api/v3/SurveyTest.php | 2 +- tests/phpunit/api/v3/SystemTest.php | 2 +- tests/phpunit/api/v3/TagTest.php | 2 +- tests/phpunit/api/v3/UFFieldTest.php | 2 +- tests/phpunit/api/v3/UFJoinTest.php | 2 +- tests/phpunit/api/v3/UFMatchTest.php | 2 +- tests/phpunit/api/v3/UtilsTest.php | 2 +- tests/phpunit/api/v3/WebsiteTest.php | 2 +- 63 files changed, 60 insertions(+), 63 deletions(-) diff --git a/tests/phpunit/api/v3/ACLCachingTest.php b/tests/phpunit/api/v3/ACLCachingTest.php index b7aefbf204..4f5fd6ff74 100644 --- a/tests/phpunit/api/v3/ACLCachingTest.php +++ b/tests/phpunit/api/v3/ACLCachingTest.php @@ -38,7 +38,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_ACLCachingTest extends CiviUnitTestCase { protected $_apiversion = 3; protected $_params; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; function setUp() { diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php index 172c9abb4f..4320cc0993 100644 --- a/tests/phpunit/api/v3/ACLPermissionTest.php +++ b/tests/phpunit/api/v3/ACLPermissionTest.php @@ -40,7 +40,7 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase { protected $hookClass = NULL; public $DBResetRequired = FALSE; - public $_eNoticeCompliant = TRUE; + protected $_entity; diff --git a/tests/phpunit/api/v3/APITest.php b/tests/phpunit/api/v3/APITest.php index d1afc74d8d..67e6a51798 100644 --- a/tests/phpunit/api/v3/APITest.php +++ b/tests/phpunit/api/v3/APITest.php @@ -35,7 +35,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; */ class api_v3_APITest extends CiviUnitTestCase { public $DBResetRequired = FALSE; - public $_eNoticeCompliant = TRUE; + protected $_apiversion =3; diff --git a/tests/phpunit/api/v3/APIWrapperTest.php b/tests/phpunit/api/v3/APIWrapperTest.php index 7c7a4aae11..6086de1d45 100644 --- a/tests/phpunit/api/v3/APIWrapperTest.php +++ b/tests/phpunit/api/v3/APIWrapperTest.php @@ -36,7 +36,7 @@ require_once 'api/Wrapper.php'; */ class api_v3_APIWrapperTest extends CiviUnitTestCase { public $DBResetRequired = FALSE; - public $_eNoticeCompliant = TRUE; + protected $_apiversion = 3; diff --git a/tests/phpunit/api/v3/ActionScheduleTest.php b/tests/phpunit/api/v3/ActionScheduleTest.php index faa76bfb45..5ff0c6f8bb 100644 --- a/tests/phpunit/api/v3/ActionScheduleTest.php +++ b/tests/phpunit/api/v3/ActionScheduleTest.php @@ -38,7 +38,7 @@ class api_v3_ActionScheduleTest extends CiviUnitTestCase { protected $_entity = 'action_schedule'; protected $_apiversion = 3; - public $_eNoticeCompliant = TRUE; + /** * Test setup for every test diff --git a/tests/phpunit/api/v3/ActivityTypeTest.php b/tests/phpunit/api/v3/ActivityTypeTest.php index bfea6f0c65..59d1d9054b 100644 --- a/tests/phpunit/api/v3/ActivityTypeTest.php +++ b/tests/phpunit/api/v3/ActivityTypeTest.php @@ -35,7 +35,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_ActivityTypeTest extends CiviUnitTestCase { protected $_apiversion; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( diff --git a/tests/phpunit/api/v3/AddressTest.php b/tests/phpunit/api/v3/AddressTest.php index a0df30bcda..e629c3ae70 100644 --- a/tests/phpunit/api/v3/AddressTest.php +++ b/tests/phpunit/api/v3/AddressTest.php @@ -38,7 +38,7 @@ class api_v3_AddressTest extends CiviUnitTestCase { protected $_contactID; protected $_locationType; protected $_params; - public $_eNoticeCompliant = TRUE; + protected $_entity; function setUp() { diff --git a/tests/phpunit/api/v3/BatchTest.php b/tests/phpunit/api/v3/BatchTest.php index f6895b00e6..804072c6a9 100644 --- a/tests/phpunit/api/v3/BatchTest.php +++ b/tests/phpunit/api/v3/BatchTest.php @@ -33,7 +33,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; * @package CiviCRM_APIv3 */ class api_v3_BatchTest extends CiviUnitTestCase { - public $_eNoticeCompliant = TRUE; + protected $_params = array(); protected $_entity = 'batch'; diff --git a/tests/phpunit/api/v3/CampaignTest.php b/tests/phpunit/api/v3/CampaignTest.php index 7e68ba68cb..f919d44f9f 100644 --- a/tests/phpunit/api/v3/CampaignTest.php +++ b/tests/phpunit/api/v3/CampaignTest.php @@ -31,7 +31,7 @@ class api_v3_CampaignTest extends CiviUnitTestCase { protected $_apiversion; protected $params; protected $id; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; function setUp() { diff --git a/tests/phpunit/api/v3/CaseTest.php b/tests/phpunit/api/v3/CaseTest.php index 10197f68b1..b1a2fd908a 100644 --- a/tests/phpunit/api/v3/CaseTest.php +++ b/tests/phpunit/api/v3/CaseTest.php @@ -47,7 +47,7 @@ class api_v3_CaseTest extends CiviUnitTestCase { protected $caseStatusGroup; protected $caseTypeGroup; protected $optionValues; - public $_eNoticeCompliant = TRUE; + /** * Test setup for every test * diff --git a/tests/phpunit/api/v3/ConstantTest.php b/tests/phpunit/api/v3/ConstantTest.php index 39eefd6865..4ec1da8e70 100644 --- a/tests/phpunit/api/v3/ConstantTest.php +++ b/tests/phpunit/api/v3/ConstantTest.php @@ -42,7 +42,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; */ class api_v3_ConstantTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $_eNoticeCompliant = TRUE; + /** * Constructor diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php index 570696bd88..bd819a5731 100644 --- a/tests/phpunit/api/v3/ContactTest.php +++ b/tests/phpunit/api/v3/ContactTest.php @@ -46,7 +46,7 @@ class api_v3_ContactTest extends CiviUnitTestCase { protected $_apiversion; protected $_entity; protected $_params; - public $_eNoticeCompliant = TRUE; + protected $_contactID; protected $_financialTypeId =1; diff --git a/tests/phpunit/api/v3/ContactTypeTest.php b/tests/phpunit/api/v3/ContactTypeTest.php index cada2e7b33..fa30954831 100644 --- a/tests/phpunit/api/v3/ContactTypeTest.php +++ b/tests/phpunit/api/v3/ContactTypeTest.php @@ -32,7 +32,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_ContactTypeTest extends CiviUnitTestCase { protected $_apiversion; - public $_eNoticeCompliant = TRUE; + function setUp() { parent::setUp(); $this->_apiversion = 3; diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php index 534de8e7a0..277e44b4c5 100644 --- a/tests/phpunit/api/v3/ContributionPageTest.php +++ b/tests/phpunit/api/v3/ContributionPageTest.php @@ -43,7 +43,7 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase { protected $contactIds = array(); protected $_entity = 'contribution_page'; protected $contribution_result = null; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = TRUE; public function setUp() { parent::setUp(); diff --git a/tests/phpunit/api/v3/ContributionRecurTest.php b/tests/phpunit/api/v3/ContributionRecurTest.php index 02476543e4..4dddae6d9a 100644 --- a/tests/phpunit/api/v3/ContributionRecurTest.php +++ b/tests/phpunit/api/v3/ContributionRecurTest.php @@ -41,7 +41,7 @@ class api_v3_ContributionRecurTest extends CiviUnitTestCase { protected $params; protected $ids = array(); protected $_entity = 'contribution_recur'; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; function setUp() { diff --git a/tests/phpunit/api/v3/ContributionSoftTest.php b/tests/phpunit/api/v3/ContributionSoftTest.php index 2b000a37c9..3d2883d725 100644 --- a/tests/phpunit/api/v3/ContributionSoftTest.php +++ b/tests/phpunit/api/v3/ContributionSoftTest.php @@ -48,7 +48,7 @@ class api_v3_ContributionSoftTest extends CiviUnitTestCase { protected $_entity = 'Contribution'; public $debug = 0; protected $_params; - public $_eNoticeCompliant = TRUE; + function setUp() { parent::setUp(); diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php index a827d8154a..6e55739313 100644 --- a/tests/phpunit/api/v3/ContributionTest.php +++ b/tests/phpunit/api/v3/ContributionTest.php @@ -48,7 +48,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { protected $_entity = 'Contribution'; public $debug = 0; protected $_params; - public $_eNoticeCompliant = TRUE; + function setUp() { parent::setUp(); diff --git a/tests/phpunit/api/v3/CustomFieldTest.php b/tests/phpunit/api/v3/CustomFieldTest.php index 1ebbfac91c..34e039a76f 100644 --- a/tests/phpunit/api/v3/CustomFieldTest.php +++ b/tests/phpunit/api/v3/CustomFieldTest.php @@ -38,7 +38,7 @@ require_once 'tests/phpunit/CiviTest/CiviUnitTestCase.php'; */ class api_v3_CustomFieldTest extends CiviUnitTestCase { protected $_apiversion; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( 'name' => 'Custom Field Create', diff --git a/tests/phpunit/api/v3/CustomGroupTest.php b/tests/phpunit/api/v3/CustomGroupTest.php index 2f9138bab7..efa227b9d5 100644 --- a/tests/phpunit/api/v3/CustomGroupTest.php +++ b/tests/phpunit/api/v3/CustomGroupTest.php @@ -39,7 +39,7 @@ class api_v3_CustomGroupTest extends CiviUnitTestCase { protected $_apiversion = 3; protected $_entity; protected $_params; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = TRUE; function get_info() { diff --git a/tests/phpunit/api/v3/CustomSearchTest.php b/tests/phpunit/api/v3/CustomSearchTest.php index 654f98e493..db49192c38 100644 --- a/tests/phpunit/api/v3/CustomSearchTest.php +++ b/tests/phpunit/api/v3/CustomSearchTest.php @@ -4,7 +4,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_CustomSearchTest extends CiviUnitTestCase { protected $_apiversion; - public $_eNoticeCompliant = TRUE; + function setUp() { $this->_apiversion = 3; parent::setUp(); diff --git a/tests/phpunit/api/v3/CustomValueContactTypeTest.php b/tests/phpunit/api/v3/CustomValueContactTypeTest.php index a173bea063..b7381545ef 100644 --- a/tests/phpunit/api/v3/CustomValueContactTypeTest.php +++ b/tests/phpunit/api/v3/CustomValueContactTypeTest.php @@ -39,7 +39,7 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { protected $_apiversion =3; protected $CustomGroupIndividual; protected $individualStudent; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( diff --git a/tests/phpunit/api/v3/CustomValueTest.php b/tests/phpunit/api/v3/CustomValueTest.php index 5c11896624..3af0d0ce81 100644 --- a/tests/phpunit/api/v3/CustomValueTest.php +++ b/tests/phpunit/api/v3/CustomValueTest.php @@ -31,7 +31,7 @@ class api_v3_CustomValueTest extends CiviUnitTestCase { protected $individual; protected $params; protected $ids; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; function setUp() { diff --git a/tests/phpunit/api/v3/DomainTest.php b/tests/phpunit/api/v3/DomainTest.php index 1325dba41e..95cef05ffc 100644 --- a/tests/phpunit/api/v3/DomainTest.php +++ b/tests/phpunit/api/v3/DomainTest.php @@ -44,7 +44,7 @@ class api_v3_DomainTest extends CiviUnitTestCase { protected $_apiversion = 3; protected $params; - public $_eNoticeCompliant = TRUE; + /** * Constructor diff --git a/tests/phpunit/api/v3/EmailTest.php b/tests/phpunit/api/v3/EmailTest.php index 467e07e7a7..3bc6dd904f 100644 --- a/tests/phpunit/api/v3/EmailTest.php +++ b/tests/phpunit/api/v3/EmailTest.php @@ -32,7 +32,7 @@ class api_v3_EmailTest extends CiviUnitTestCase { protected $_locationType; protected $_entity; protected $_params; - public $_eNoticeCompliant = TRUE; + function setUp() { $this->_apiversion = 3; $this->_entity = 'Email'; diff --git a/tests/phpunit/api/v3/EntityTagTest.php b/tests/phpunit/api/v3/EntityTagTest.php index 1e6a0e77a0..ce02d1c9b9 100644 --- a/tests/phpunit/api/v3/EntityTagTest.php +++ b/tests/phpunit/api/v3/EntityTagTest.php @@ -45,7 +45,7 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { protected $_apiversion = 3; protected $_tag; protected $_entity = 'entity_tag'; - public $_eNoticeCompliant = TRUE; + function setUp() { parent::setUp(); diff --git a/tests/phpunit/api/v3/EventTest.php b/tests/phpunit/api/v3/EventTest.php index b8349e07ff..2450ce2b7d 100644 --- a/tests/phpunit/api/v3/EventTest.php +++ b/tests/phpunit/api/v3/EventTest.php @@ -32,7 +32,7 @@ class api_v3_EventTest extends CiviUnitTestCase { protected $_params; protected $_apiversion; protected $_entity; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( 'name' => 'Event Create', diff --git a/tests/phpunit/api/v3/GrantTest.php b/tests/phpunit/api/v3/GrantTest.php index d62436e569..cf57b99ad5 100644 --- a/tests/phpunit/api/v3/GrantTest.php +++ b/tests/phpunit/api/v3/GrantTest.php @@ -40,7 +40,7 @@ class api_v3_GrantTest extends CiviUnitTestCase { protected $params; protected $ids = array(); protected $_entity = 'Grant'; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; function setUp() { diff --git a/tests/phpunit/api/v3/GroupContactTest.php b/tests/phpunit/api/v3/GroupContactTest.php index e69c7c5121..64966bb08e 100644 --- a/tests/phpunit/api/v3/GroupContactTest.php +++ b/tests/phpunit/api/v3/GroupContactTest.php @@ -34,7 +34,6 @@ class api_v3_GroupContactTest extends CiviUnitTestCase { protected $_contactId1; protected $_apiversion = 3; protected $_groupId1; - public $_eNoticeCompliant = True; function get_info() { return array( diff --git a/tests/phpunit/api/v3/GroupNestingTest.php b/tests/phpunit/api/v3/GroupNestingTest.php index f5a8655774..85bae2725c 100644 --- a/tests/phpunit/api/v3/GroupNestingTest.php +++ b/tests/phpunit/api/v3/GroupNestingTest.php @@ -35,7 +35,6 @@ require_once 'CiviTest/CiviUnitTestCase.php'; */ class api_v3_GroupNestingTest extends CiviUnitTestCase { protected $_apiversion; - public $_eNoticeCompliant = True; /** * Sets up the fixture, for example, opens a network connection. diff --git a/tests/phpunit/api/v3/GroupOrganizationTest.php b/tests/phpunit/api/v3/GroupOrganizationTest.php index 89cbce9a75..1379e289d9 100644 --- a/tests/phpunit/api/v3/GroupOrganizationTest.php +++ b/tests/phpunit/api/v3/GroupOrganizationTest.php @@ -35,7 +35,6 @@ require_once 'CiviTest/CiviUnitTestCase.php'; */ class api_v3_GroupOrganizationTest extends CiviUnitTestCase { protected $_apiversion; - public $_eNoticeCompliant = True; function get_info() { return array( diff --git a/tests/phpunit/api/v3/ImTest.php b/tests/phpunit/api/v3/ImTest.php index d1eda9ec4a..9e9a59ecd1 100644 --- a/tests/phpunit/api/v3/ImTest.php +++ b/tests/phpunit/api/v3/ImTest.php @@ -40,7 +40,7 @@ class api_v3_ImTest extends CiviUnitTestCase { protected $params; protected $id; protected $_entity; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; function setUp() { diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php index 143cf3f788..a4f1d0cedc 100644 --- a/tests/phpunit/api/v3/JobTest.php +++ b/tests/phpunit/api/v3/JobTest.php @@ -38,7 +38,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_JobTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; public $_entity = 'Job'; public $_params = array(); diff --git a/tests/phpunit/api/v3/LineItemTest.php b/tests/phpunit/api/v3/LineItemTest.php index b9a1996a87..1d46fee12d 100644 --- a/tests/phpunit/api/v3/LineItemTest.php +++ b/tests/phpunit/api/v3/LineItemTest.php @@ -34,7 +34,7 @@ class api_v3_LineItemTest extends CiviUnitTestCase { protected $contactIds = array(); protected $_entity = 'line_item'; protected $contribution_result = null; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = TRUE; protected $_financialTypeId = 1; diff --git a/tests/phpunit/api/v3/LocBlockTest.php b/tests/phpunit/api/v3/LocBlockTest.php index e749b1baef..b44577123c 100644 --- a/tests/phpunit/api/v3/LocBlockTest.php +++ b/tests/phpunit/api/v3/LocBlockTest.php @@ -29,7 +29,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_LocBlockTest extends CiviUnitTestCase { protected $_apiversion = 3; protected $_entity = 'loc_block'; - public $_eNoticeCompliant = TRUE; + public function setUp() { parent::setUp(); } diff --git a/tests/phpunit/api/v3/MailingGroupTest.php b/tests/phpunit/api/v3/MailingGroupTest.php index 6d614a6313..5fc25f0099 100644 --- a/tests/phpunit/api/v3/MailingGroupTest.php +++ b/tests/phpunit/api/v3/MailingGroupTest.php @@ -36,7 +36,7 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase { protected $_groupID; protected $_email; protected $_apiversion; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( diff --git a/tests/phpunit/api/v3/MailingTest.php b/tests/phpunit/api/v3/MailingTest.php index 846dfcc5ed..a40847fc7b 100644 --- a/tests/phpunit/api/v3/MailingTest.php +++ b/tests/phpunit/api/v3/MailingTest.php @@ -37,7 +37,7 @@ class api_v3_MailingTest extends CiviUnitTestCase { protected $_apiversion = 3; protected $_params = array(); protected $_entity = 'Mailing'; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( diff --git a/tests/phpunit/api/v3/MembershipStatusTest.php b/tests/phpunit/api/v3/MembershipStatusTest.php index 6a15fbc587..1dd85c613e 100644 --- a/tests/phpunit/api/v3/MembershipStatusTest.php +++ b/tests/phpunit/api/v3/MembershipStatusTest.php @@ -32,7 +32,7 @@ class api_v3_MembershipStatusTest extends CiviUnitTestCase { protected $_contributionTypeID; protected $_membershipTypeID; protected $_membershipStatusID; - public $_eNoticeCompliant = TRUE; + protected $_apiversion =3; function get_info() { diff --git a/tests/phpunit/api/v3/MembershipTest.php b/tests/phpunit/api/v3/MembershipTest.php index 0e00afbd87..f4023963e1 100644 --- a/tests/phpunit/api/v3/MembershipTest.php +++ b/tests/phpunit/api/v3/MembershipTest.php @@ -44,7 +44,7 @@ class api_v3_MembershipTest extends CiviUnitTestCase { protected $__membershipID; protected $_entity; protected $_params; - public $_eNoticeCompliant = TRUE; + public function setUp() { // Connect to the database diff --git a/tests/phpunit/api/v3/MembershipTypeTest.php b/tests/phpunit/api/v3/MembershipTypeTest.php index 16cc9868a5..1199ba50df 100644 --- a/tests/phpunit/api/v3/MembershipTypeTest.php +++ b/tests/phpunit/api/v3/MembershipTypeTest.php @@ -32,7 +32,7 @@ class api_v3_MembershipTypeTest extends CiviUnitTestCase { protected $_contributionTypeID; protected $_apiversion; protected $_entity = 'MembershipType'; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( diff --git a/tests/phpunit/api/v3/NoteTest.php b/tests/phpunit/api/v3/NoteTest.php index 57d0af17f4..c483bdc5a2 100644 --- a/tests/phpunit/api/v3/NoteTest.php +++ b/tests/phpunit/api/v3/NoteTest.php @@ -38,7 +38,7 @@ class api_v3_NoteTest extends CiviUnitTestCase { protected $_params; protected $_noteID; protected $_note; - public $_eNoticeCompliant = TRUE; + function __construct() { parent::__construct(); diff --git a/tests/phpunit/api/v3/OptionGroupTest.php b/tests/phpunit/api/v3/OptionGroupTest.php index 0083581180..f009f0a312 100644 --- a/tests/phpunit/api/v3/OptionGroupTest.php +++ b/tests/phpunit/api/v3/OptionGroupTest.php @@ -28,7 +28,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_OptionGroupTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $_eNoticeCompliant = TRUE; + protected $_entity = 'OptionGroup'; function setUp() { diff --git a/tests/phpunit/api/v3/OptionValueTest.php b/tests/phpunit/api/v3/OptionValueTest.php index 201c887975..961b6afe66 100644 --- a/tests/phpunit/api/v3/OptionValueTest.php +++ b/tests/phpunit/api/v3/OptionValueTest.php @@ -29,7 +29,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_OptionValueTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $_eNoticeCompliant = TRUE; + function setUp() { parent::setUp(); } diff --git a/tests/phpunit/api/v3/ParticipantPaymentTest.php b/tests/phpunit/api/v3/ParticipantPaymentTest.php index 623318c95f..3ff10d7c96 100644 --- a/tests/phpunit/api/v3/ParticipantPaymentTest.php +++ b/tests/phpunit/api/v3/ParticipantPaymentTest.php @@ -44,7 +44,7 @@ class api_v3_ParticipantPaymentTest extends CiviUnitTestCase { protected $_eventID; protected $_participantPaymentID; protected $_contributionTypeId; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( diff --git a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php index 1672e5002f..da7b3cfd32 100644 --- a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php +++ b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php @@ -31,7 +31,7 @@ class api_v3_ParticipantStatusTypeTest extends CiviUnitTestCase { protected $_apiversion; protected $params; protected $id; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; diff --git a/tests/phpunit/api/v3/PaymentProcessorTest.php b/tests/phpunit/api/v3/PaymentProcessorTest.php index ec0f45008e..19c0b1db68 100644 --- a/tests/phpunit/api/v3/PaymentProcessorTest.php +++ b/tests/phpunit/api/v3/PaymentProcessorTest.php @@ -35,7 +35,7 @@ class api_v3_PaymentProcessorTest extends CiviUnitTestCase { protected $_paymentProcessorType; protected $_apiversion = 3; protected $_params; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( 'name' => 'PaymentProcessor Create', diff --git a/tests/phpunit/api/v3/PaymentProcessorTypeTest.php b/tests/phpunit/api/v3/PaymentProcessorTypeTest.php index 1165548271..b18e82ab7a 100644 --- a/tests/phpunit/api/v3/PaymentProcessorTypeTest.php +++ b/tests/phpunit/api/v3/PaymentProcessorTypeTest.php @@ -34,7 +34,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_PaymentProcessorTypeTest extends CiviUnitTestCase { protected $_ppTypeID; protected $_apiversion; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( 'name' => 'PaymentProcessorType Create', diff --git a/tests/phpunit/api/v3/PhoneTest.php b/tests/phpunit/api/v3/PhoneTest.php index 877452eb92..e4aa50c0de 100644 --- a/tests/phpunit/api/v3/PhoneTest.php +++ b/tests/phpunit/api/v3/PhoneTest.php @@ -40,7 +40,7 @@ class api_v3_PhoneTest extends CiviUnitTestCase { protected $_contactID; protected $_locationType; protected $_params; - public $_eNoticeCompliant = TRUE; + function setUp() { $this->_apiversion = 3; diff --git a/tests/phpunit/api/v3/PriceFieldTest.php b/tests/phpunit/api/v3/PriceFieldTest.php index bd6ad098cd..d2abf4acdc 100644 --- a/tests/phpunit/api/v3/PriceFieldTest.php +++ b/tests/phpunit/api/v3/PriceFieldTest.php @@ -32,7 +32,7 @@ class api_v3_PriceFieldTest extends CiviUnitTestCase { protected $id = 0; protected $priceSetID = 0; protected $_entity = 'price_field'; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = TRUE; public function setUp() { diff --git a/tests/phpunit/api/v3/PriceFieldValueTest.php b/tests/phpunit/api/v3/PriceFieldValueTest.php index 637562eb97..3709e943c4 100644 --- a/tests/phpunit/api/v3/PriceFieldValueTest.php +++ b/tests/phpunit/api/v3/PriceFieldValueTest.php @@ -33,7 +33,7 @@ class api_v3_PriceFieldValueTest extends CiviUnitTestCase { protected $id = 0; protected $priceSetID = 0; protected $_entity = 'price_field_value'; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = TRUE; public function setUp() { diff --git a/tests/phpunit/api/v3/PriceSetTest.php b/tests/phpunit/api/v3/PriceSetTest.php index 6334c25ce3..29bada876c 100644 --- a/tests/phpunit/api/v3/PriceSetTest.php +++ b/tests/phpunit/api/v3/PriceSetTest.php @@ -33,7 +33,7 @@ class api_v3_PriceSetTest extends CiviUnitTestCase { protected $id = 0; protected $contactIds = array(); protected $_entity = 'price_set'; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = TRUE; public function setUp() { parent::setUp(); diff --git a/tests/phpunit/api/v3/RelationshipTest.php b/tests/phpunit/api/v3/RelationshipTest.php index 0b8a8d2115..ed31647a29 100644 --- a/tests/phpunit/api/v3/RelationshipTest.php +++ b/tests/phpunit/api/v3/RelationshipTest.php @@ -46,7 +46,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase { protected $_customGroupId = NULL; protected $_customFieldId = NULL; protected $_params; - public $_eNoticeCompliant = TRUE; + protected $_entity; function get_info() { return array( diff --git a/tests/phpunit/api/v3/RelationshipTypeTest.php b/tests/phpunit/api/v3/RelationshipTypeTest.php index 03823482bb..3f2912c1e0 100644 --- a/tests/phpunit/api/v3/RelationshipTypeTest.php +++ b/tests/phpunit/api/v3/RelationshipTypeTest.php @@ -63,7 +63,7 @@ class api_v3_RelationshipTypeTest extends CiviUnitTestCase { protected $_cId_b; protected $_relTypeID; protected $_apiversion = 3; - public $_eNoticeCompliant = TRUE; + function get_info() { return array( 'name' => 'RelationshipType Create', diff --git a/tests/phpunit/api/v3/ReportTemplateTest.php b/tests/phpunit/api/v3/ReportTemplateTest.php index c0c33e8c11..0674387cff 100644 --- a/tests/phpunit/api/v3/ReportTemplateTest.php +++ b/tests/phpunit/api/v3/ReportTemplateTest.php @@ -37,7 +37,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_ReportTemplateTest extends CiviUnitTestCase { protected $_apiversion = 3; - public $_eNoticeCompliant = TRUE; + function setUp() { parent::setUp(); $this->_sethtmlGlobals(); diff --git a/tests/phpunit/api/v3/SettingTest.php b/tests/phpunit/api/v3/SettingTest.php index 6f67edc218..31a923841d 100644 --- a/tests/phpunit/api/v3/SettingTest.php +++ b/tests/phpunit/api/v3/SettingTest.php @@ -47,7 +47,7 @@ class api_v3_SettingTest extends CiviUnitTestCase { protected $_currentDomain; protected $_domainID2; protected $_domainID3; - public $_eNoticeCompliant = TRUE; + function __construct() { parent::__construct(); diff --git a/tests/phpunit/api/v3/SurveyRespondantTest.php b/tests/phpunit/api/v3/SurveyRespondantTest.php index 8cab02dbc0..53ae820367 100644 --- a/tests/phpunit/api/v3/SurveyRespondantTest.php +++ b/tests/phpunit/api/v3/SurveyRespondantTest.php @@ -30,7 +30,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_SurveyRespondantTest extends CiviUnitTestCase { protected $_apiversion =3; protected $params; - public $_eNoticeCompliant = TRUE; + function setUp() { $phoneBankActivity = $this->callAPISuccess('Option_value', 'Get', array('label' => 'PhoneBank', 'sequential' => 1)); diff --git a/tests/phpunit/api/v3/SurveyTest.php b/tests/phpunit/api/v3/SurveyTest.php index 5e0001841a..b751befff3 100644 --- a/tests/phpunit/api/v3/SurveyTest.php +++ b/tests/phpunit/api/v3/SurveyTest.php @@ -52,7 +52,7 @@ class api_v3_SurveyTest extends CiviUnitTestCase { protected $params; protected $entity = 'survey'; public $DBResetRequired = FALSE; - public $_eNoticeCompliant = TRUE; + function setUp() { $phoneBankActivityTypeID = $this->callAPISuccessGetValue('Option_value', array('label' => 'PhoneBank', 'return' => 'id'), 'integer'); diff --git a/tests/phpunit/api/v3/SystemTest.php b/tests/phpunit/api/v3/SystemTest.php index 58d7e78596..060d990ab2 100644 --- a/tests/phpunit/api/v3/SystemTest.php +++ b/tests/phpunit/api/v3/SystemTest.php @@ -63,7 +63,7 @@ class api_v3_SystemTest extends CiviUnitTestCase { const TEST_CACHE_GROUP = 'SystemTest'; const TEST_CACHE_PATH = 'api/v3/system'; - public $_eNoticeCompliant = TRUE; + /** * Constructor * diff --git a/tests/phpunit/api/v3/TagTest.php b/tests/phpunit/api/v3/TagTest.php index a956eb528a..62419f7f0c 100644 --- a/tests/phpunit/api/v3/TagTest.php +++ b/tests/phpunit/api/v3/TagTest.php @@ -48,7 +48,7 @@ class api_v3_TagTest extends CiviUnitTestCase { protected $tag = array(); protected $tagID; - public $_eNoticeCompliant = TRUE; + function setUp() { parent::setUp(); $this->tag = $this->tagCreate(); diff --git a/tests/phpunit/api/v3/UFFieldTest.php b/tests/phpunit/api/v3/UFFieldTest.php index 9369ff324e..bb0bbf3847 100644 --- a/tests/phpunit/api/v3/UFFieldTest.php +++ b/tests/phpunit/api/v3/UFFieldTest.php @@ -42,7 +42,7 @@ class api_v3_UFFieldTest extends CiviUnitTestCase { protected $_apiversion = 3; protected $_params; protected $_entity = 'uf_field'; - public $_eNoticeCompliant = TRUE; + protected function setUp() { parent::setUp(); diff --git a/tests/phpunit/api/v3/UFJoinTest.php b/tests/phpunit/api/v3/UFJoinTest.php index 0c1816c001..7b97e43d1f 100644 --- a/tests/phpunit/api/v3/UFJoinTest.php +++ b/tests/phpunit/api/v3/UFJoinTest.php @@ -42,7 +42,7 @@ class api_v3_UFJoinTest extends CiviUnitTestCase { protected $_ufFieldId; protected $_contactId = 69; protected $_apiversion; - public $_eNoticeCompliant = TRUE; + protected function setUp() { parent::setUp(); // Truncate the tables diff --git a/tests/phpunit/api/v3/UFMatchTest.php b/tests/phpunit/api/v3/UFMatchTest.php index f35d6b479f..0599f586a8 100644 --- a/tests/phpunit/api/v3/UFMatchTest.php +++ b/tests/phpunit/api/v3/UFMatchTest.php @@ -44,7 +44,7 @@ class api_v3_UFMatchTest extends CiviUnitTestCase { protected $_apiversion; protected $_params = array(); - public $_eNoticeCompliant = TRUE; + protected function setUp() { parent::setUp(); diff --git a/tests/phpunit/api/v3/UtilsTest.php b/tests/phpunit/api/v3/UtilsTest.php index 76ad74829a..389ffc927f 100644 --- a/tests/phpunit/api/v3/UtilsTest.php +++ b/tests/phpunit/api/v3/UtilsTest.php @@ -36,7 +36,7 @@ require_once 'CRM/Utils/DeprecatedUtils.php'; class api_v3_UtilsTest extends CiviUnitTestCase { protected $_apiversion = 3; public $DBResetRequired = FALSE; - public $_eNoticeCompliant = TRUE; + public $_contactID = 1; /** diff --git a/tests/phpunit/api/v3/WebsiteTest.php b/tests/phpunit/api/v3/WebsiteTest.php index b42913bc28..7484c2077b 100644 --- a/tests/phpunit/api/v3/WebsiteTest.php +++ b/tests/phpunit/api/v3/WebsiteTest.php @@ -40,7 +40,7 @@ class api_v3_WebsiteTest extends CiviUnitTestCase { protected $params; protected $id; protected $_entity; - public $_eNoticeCompliant = TRUE; + public $DBResetRequired = FALSE; function setUp() { -- 2.25.1