From a7d56832a3480dbfeee2fbe9524db944cfffe880 Mon Sep 17 00:00:00 2001
From: Eileen <eileen@fuzion.co.nz>
Date: Fri, 3 Jan 2014 17:50:41 +1300
Subject: [PATCH] Tests e-notice fix

---
 .../CRM/Core/Payment/AuthorizeNetTest.php     | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php b/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php
index 84019ed303..cab4501e30 100644
--- a/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php
+++ b/tests/phpunit/CRM/Core/Payment/AuthorizeNetTest.php
@@ -28,12 +28,8 @@
 
 require_once 'CiviTest/CiviUnitTestCase.php';
 require_once 'CiviTest/AuthorizeNet.php';
-require_once 'CiviTest/Contact.php';
+
 class CRM_Core_Payment_AuthorizeNetTest 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' => 'Authorize.net processing',
@@ -51,6 +47,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
       'user_name' => $this->processorParams->user_name,
       'password' => $this->processorParams->password,
       'url_recur' => $this->processorParams->url_recur,
+      'signature' => '',
     );
 
     $this->processor = new CRM_Core_Payment_AuthorizeNet('Contribute', $paymentProcessor);
@@ -76,7 +73,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
     $firstName  = 'John_' .  substr(sha1(rand()), 0, 7);
     $lastName   = 'Smith_' . substr(sha1(rand()), 0, 7);
     $nameParams = array('first_name' => $firstName, 'last_name' => $lastName);
-    $contactId  = Contact::createIndividual($nameParams);
+    $contactId  = $this->individualCreate($nameParams);
 
     $invoiceID = sha1(rand());
     $amount    = rand(100, 1000) . '.00';
@@ -95,7 +92,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
       'is_test' => 1,
       'payment_processor_id' => $this->processorParams->id,
     );
-    $recur = CRM_Contribute_BAO_ContributionRecur::add($contributionRecurParams, $ids);
+    $recur = CRM_Contribute_BAO_ContributionRecur::add($contributionRecurParams);
 
     $contributionParams = array(
       'contact_id'   => $contactId,
@@ -108,7 +105,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
       'is_test'      => 1,
       'contribution_status_id' => 2,
     );
-    $contribution = CRM_Contribute_BAO_Contribution::add($contributionParams, $ids);
+    $contribution = CRM_Contribute_BAO_Contribution::add($contributionParams);
 
     $params = array(
       'qfKey' => '08ed21c7ca00a1f7d32fff2488596ef7_4454',
@@ -195,10 +192,9 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
 
     // cancel it or the transaction will be rejected by A.net if the test is re-run
     $subscriptionID = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_ContributionRecur', $recur->id, 'processor_id');
+    $message = '';
     $result = $this->processor->cancelSubscription($message, array('subscriptionId' => $subscriptionID));
     $this->assertTrue($result, 'Failed to cancel subscription with Authorize.');
-
-    Contact::delete($contactId);
   }
 
   /**
@@ -210,7 +206,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
     $firstName  = 'John_' .  substr(sha1(rand()), 0, 7);
     $lastName   = 'Smith_' . substr(sha1(rand()), 0, 7);
     $nameParams = array('first_name' => $firstName, 'last_name' => $lastName);
-    $contactId  = Contact::createIndividual($nameParams);
+    $contactId  = $this->individualCreate($nameParams);
 
     $ids = array('contribution' => NULL);
     $invoiceID = sha1(rand());
@@ -244,7 +240,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
       'contribution_status_id' => 2,
     );
 
-    $this->callAPISuccess('contribution', 'create', $contributionParams);
+    $contribution = $this->callAPISuccess('contribution', 'create', $contributionParams);
 
     $params = array(
       'qfKey' => '00ed21c7ca00a1f7d555555596ef7_4454',
@@ -314,7 +310,7 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
       'contributionPageID' => '',
       'email' => "{$firstName}.{$lastName}@example.com",
       'contactID' => $contactId,
-      'contributionID' => $contribution->id,
+      'contributionID' => $contribution['id'],
       'contributionTypeID' => $this->_financialTypeId,
       'contributionRecurID' => $recur->id,
     );
@@ -337,9 +333,8 @@ class CRM_Core_Payment_AuthorizeNetTest extends CiviUnitTestCase {
 
     // cancel it or the transaction will be rejected by A.net if the test is re-run
     $subscriptionID = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_ContributionRecur', $recur->id, 'processor_id');
+    $message = '';
     $result = $this->processor->cancelSubscription($message, array('subscriptionId' => $subscriptionID));
     $this->assertTrue($result, 'Failed to cancel subscription with Authorize.');
-
-    Contact::delete($contactId);
   }
 }
-- 
2.25.1