From 100b6b38a6516f563dde38538abba6b7f46687af Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 12 Jun 2013 21:42:46 -0700
Subject: [PATCH] Fix api_v3_MembershipTest

---
 tests/phpunit/api/v3/MembershipTest.php | 28 ++-----------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/tests/phpunit/api/v3/MembershipTest.php b/tests/phpunit/api/v3/MembershipTest.php
index cb086b169a..002346b0bd 100644
--- a/tests/phpunit/api/v3/MembershipTest.php
+++ b/tests/phpunit/api/v3/MembershipTest.php
@@ -191,30 +191,6 @@ class api_v3_MembershipTest extends CiviUnitTestCase {
     $this->assertEquals($result['id'], $membership['id']);
   }
 
-  /**
-   * Test civicrm_membership_get with params not array.
-   * Gets treated as contact_id, memberships expected.
-   */
-  function testGetWithNonExistantMemberShipTypeId() {
-    $this->_membershipID = $this->contactMembershipCreate($this->_params);
-    $params = array(
-      'membership_type_id' => 465653,
-      'version' => $this->_apiversion,
-    );
-    $result = civicrm_api('membership', 'get', $params);
-    civicrm_api('Membership', 'Delete', array(
-      'id' => $this->_membershipID,
-        'version' => $this->_apiversion,
-      ));
-
-    $this->assertAPISuccess($result, "In line " . __LINE__);
-    $this->assertEquals($result['count'], 0, "In line " . __LINE__);
-    civicrm_api('Membership', 'Delete', array(
-      'id' => $this->_membershipID,
-        'version' => $this->_apiversion,
-      ));
-  }
-
   /**
    * check with complete array + custom field
    * Note that the test is written on purpose without any
@@ -521,7 +497,7 @@ class api_v3_MembershipTest extends CiviUnitTestCase {
     $params['status_id'] = 999;
 
     $result = civicrm_api('membership', 'create', $params);
-    $this->assertEquals('status_id is not valid : 999', $result['error_message']);
+    $this->assertEquals("'999' is not a valid option for field status_id", $result['error_message']);
   }
 
   function testMembershipCreateWithInvalidType() {
@@ -529,7 +505,7 @@ class api_v3_MembershipTest extends CiviUnitTestCase {
     $params['membership_type_id'] = 999;
 
     $result = civicrm_api('membership', 'create', $params);
-    $this->assertEquals('membership_type_id is not valid : 999', $result['error_message']);
+    $this->assertEquals("'999' is not a valid option for field membership_type_id", $result['error_message']);
   }
 
   /**
-- 
2.25.1