E-notice fixes in tests

diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
index cc8664c1519685a30c6f068fc6f6d2dd01371967..26238035f05810d2fbc7f16bd39faba040ba166b 100644 (file)
--- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
@@ -34,10 +34,6 @@ require_once 'CiviTest/Membership.php';
 require_once 'CRM/Core/Controller.php';
 
 class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
-  //@todo make BAO enotice compliant  & remove the line below
-  // WARNING - NEVER COPY & PASTE $_eNoticeCompliant = FALSE
-  // new test classes should be compliant.
-  public $_eNoticeCompliant = FALSE;
   function get_info() {
     return array(
       'name' => 'Membership BAOs',
@@ -211,6 +207,7 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
       'contact_id', 'Database check for created membership.'
     );
     $params = array('id' => $membershipId);
+    $values = array();
     CRM_Member_BAO_Membership::retrieve($params, $values);
     $this->assertEquals($values['id'], $membershipId, 'Verify membership record is retrieved.');
 
@@ -239,6 +236,7 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
     );
 
     $params = array('id' => $membershipId1);
+    $values1 = array();
     CRM_Member_BAO_Membership::retrieve($params, $values1);
     $membership = array($membershipId1 => $values1);
 
@@ -260,6 +258,7 @@ class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
     );
 
     $params = array('id' => $membershipId2);
+    $values2 = array();
     CRM_Member_BAO_Membership::retrieve($params, $values2);
     $membership[$membershipId2] = $values2;
 

diff --git a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php
index 3e9879291829be2ad5378a59913c08ee831fb23b..63f1d46603f0e39f8209a130be8fcd3752720132 100644 (file)
--- a/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Import/Parser/MembershipTest.php
@@ -34,8 +34,6 @@ require_once 'CiviTest/Membership.php';
  *  @package   CiviCRM
  */
 class CRM_Member_Import_Parser_MembershipTest extends CiviUnitTestCase {
-
-  public $_eNoticeCompliant = TRUE;
   /**
    * Membership type name used in test function
    * @var String
@@ -87,6 +85,7 @@ class CRM_Member_Import_Parser_MembershipTest extends CiviUnitTestCase {
       'fixed_period_start_day' => 101,
       'fixed_period_rollover_day' => 1231
     );
+    $ids = array();
     $membershipType = CRM_Member_BAO_MembershipType::add($params, $ids);
     $this->_membershipTypeID = $membershipType->id;
 

diff --git a/tests/phpunit/CRM/Utils/ArrayTest.php b/tests/phpunit/CRM/Utils/ArrayTest.php
index 23ccaf1daef0de0f7907ddd30ba2d7277ec32b21..8b2509f2fa6d4cc4e2b79df74c70e49f1a722d38 100644 (file)
--- a/tests/phpunit/CRM/Utils/ArrayTest.php
+++ b/tests/phpunit/CRM/Utils/ArrayTest.php
@@ -1,10 +1,6 @@
 <?php
 require_once 'CiviTest/CiviUnitTestCase.php';
 class CRM_Utils_ArrayTest extends CiviUnitTestCase {
-  //@todo make BAO enotice compliant  & remove the line below
-  // WARNING - NEVER COPY & PASTE $_eNoticeCompliant = FALSE
-  // new test classes should be compliant.
-  public $_eNoticeCompliant = FALSE;
   function testBreakReference() {
     // Get a reference and make a change
     $fooRef1 = self::returnByReference();