From 53191813c147dbddcd907411c87f9c0ef54275f1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 13 Jun 2013 16:00:37 -0700
Subject: [PATCH] Fix ContributionTest

---
 api/v3/Contribution.php                   |  1 +
 tests/phpunit/api/v3/ContributionTest.php | 28 ++++++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 1635c0b5bd..68214b516c 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -94,6 +94,7 @@ function civicrm_api3_contribution_create(&$params) {
 function _civicrm_api3_contribution_create_spec(&$params) {
   $params['contact_id']['api.required'] = 1;
   $params['total_amount']['api.required'] = 1;
+  $params['payment_instrument_id']['api.aliases'] = array('payment_instrument');
   $params['payment_processor'] = array(
     'name' => 'payment_processor',
     'title' => 'Payment Processor ID',
diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index a3bc912e45..306cf5188c 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -543,20 +543,26 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
    */
   function testCreateContributionWithPaymentInstrument() {
     $params = $this->_params + array('payment_instrument' => 'EFT');
-    $contribution =  civicrm_api('contribution','create',$params);
-    $contribution = civicrm_api('contribution','get',array('version'=> 3, 'sequential' => 1, 'id' => $contribution['id']));
+    $contribution = $this->callAPISuccess('contribution', 'create', $params);
+    $contribution = $this->callAPISuccess('contribution','get', array(
+      'sequential' => 1,
+      'id' => $contribution['id']
+    ));
     $this->assertArrayHasKey('payment_instrument', $contribution['values'][0]);
-    $eftTypeId = CRM_Core_OptionGroup::getValue('payment_instrument', 'EFT');
-    $this->assertEquals('EFT',$contribution['values'][0]['payment_instrument']);
-    $contribution = civicrm_api('contribution', 'update', array('id' => $contribution['id'], 'version' => $this->_apiversion, 'payment_instrument' => 'Credit Card'));
-    $this->assertAPISuccess($contribution);
+    $this->assertEquals('EFT', $contribution['values'][0]['payment_instrument']);
+
+    $this->callAPISuccess('contribution', 'create', array('id' => $contribution['id'], 'payment_instrument' => 'Credit Card'));
+    $contribution = $this->callAPISuccess('contribution','get', array(
+      'sequential' => 1,
+      'id' => $contribution['id']
+    ));
+    $this->assertArrayHasKey('payment_instrument', $contribution['values'][0]);
+    $this->assertEquals('Credit Card', $contribution['values'][0]['payment_instrument']);
   }
 
   function testGetContributionByPaymentInstrument() {
-    $eftTypeId = CRM_Core_OptionGroup::getValue('payment_instrument', 'EFT');
-    $cashTypeId = CRM_Core_OptionGroup::getValue('payment_instrument', 'Cash');
     $params = $this->_params + array('payment_instrument' => 'EFT');
-    $params2 = $this->_params + array('payment_instrument' => 'Cash',);
+    $params2 = $this->_params + array('payment_instrument' => 'Cash');
     civicrm_api('contribution','create',$params);
     $contribution = civicrm_api('contribution','create',$params2);
     $this->assertAPISuccess($contribution);
@@ -574,8 +580,8 @@ class api_v3_ContributionTest extends CiviUnitTestCase {
     $this->assertEquals(1,$contribution['count']);
     $contribution = civicrm_api('contribution','get',array('version'=> 3, 'sequential' => 1, 'payment_instrument' => 'EFT'));
     $this->assertArrayHasKey('payment_instrument', $contribution['values'][0]);
-    $this->assertEquals('EFT',$contribution['values'][0]['payment_instrument']);
-    $this->assertEquals(1,$contribution['count']);
+    $this->assertEquals('EFT', $contribution['values'][0]['payment_instrument']);
+    $this->assertEquals(1, $contribution['count']);
     $contribution = civicrm_api('contribution', 'update', array('id' => $contribution['id'], 'version' => $this->_apiversion, 'payment_instrument' => 'Credit Card'));
     $this->assertAPISuccess($contribution);
     $contribution = civicrm_api('contribution','get',array('version'=> 3, 'sequential' => 1, 'id' => $contribution['id'], ));
-- 
2.25.1