From fc928539f1578d57ce0e69066cfefe4e85de70fe Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 26 Jul 2013 19:31:11 +1200 Subject: [PATCH] CRM-13072 upgrade additional test classes --- tests/phpunit/api/v3/ConstantTest.php | 45 +--- tests/phpunit/api/v3/ContactTypeTest.php | 101 +++----- tests/phpunit/api/v3/ContributionPageTest.php | 52 ++--- .../phpunit/api/v3/ContributionRecurTest.php | 36 ++- tests/phpunit/api/v3/ContributionTest.php | 11 +- tests/phpunit/api/v3/CustomSearchTest.php | 17 +- .../api/v3/CustomValueContactTypeTest.php | 78 +++---- tests/phpunit/api/v3/CustomValueTest.php | 55 +---- tests/phpunit/api/v3/DomainTest.php | 46 +--- tests/phpunit/api/v3/EntityTagTest.php | 215 +++--------------- 10 files changed, 170 insertions(+), 486 deletions(-) diff --git a/tests/phpunit/api/v3/ConstantTest.php b/tests/phpunit/api/v3/ConstantTest.php index 5e417823ee..39eefd6865 100644 --- a/tests/phpunit/api/v3/ConstantTest.php +++ b/tests/phpunit/api/v3/ConstantTest.php @@ -68,11 +68,9 @@ class api_v3_ConstantTest extends CiviUnitTestCase { * Test civicrm_constant_get( ) for unknown constant */ public function testUnknownConstant() { - $result = civicrm_api('constant', 'get', array( + $result = $this->callAPIFailure('constant', 'get', array( 'name' => 'thisTypeDoesNotExist', - 'version' => $this->_apiversion, - )); - $this->assertEquals(1, $result['is_error'], "In line " . __LINE__); + )); } /** @@ -80,19 +78,15 @@ class api_v3_ConstantTest extends CiviUnitTestCase { */ public function testActivityStatus() { - $result = civicrm_api('constant', 'get', array( + $result = $this->callAPISuccess('constant', 'get', array( 'name' => 'activityStatus', - 'version' => $this->_apiversion, - )); + )); $this->assertTrue($result['count'] > 5, "In line " . __LINE__); $this->assertContains('Scheduled', $result['values'], "In line " . __LINE__); $this->assertContains('Completed', $result['values'], "In line " . __LINE__); $this->assertContains('Cancelled', $result['values'], "In line " . __LINE__); - $this->assertTrue(empty($result['is_error']), - "In line " . __LINE__ - ); } /** @@ -102,15 +96,11 @@ class api_v3_ConstantTest extends CiviUnitTestCase { $parameters = array(TRUE, FALSE, TRUE); - $result = civicrm_api('constant', 'get', array( + $result = $this->callAPISuccess('constant', 'get', array( 'name' => 'activityType', - 'version' => $this->_apiversion, - )); + )); $this->assertTrue($result['count'] > 2, "In line " . __LINE__); $this->assertContains('Meeting', $result['values'], "In line " . __LINE__); - $this->assertTrue(empty($result['is_error']), - "In line " . __LINE__ - ); } /** @@ -122,19 +112,13 @@ class api_v3_ConstantTest extends CiviUnitTestCase { $params = array( 'field' => 'location_type_id', - 'version' => $this->_apiversion, ); - $result = civicrm_api('address', 'getoptions', $params); - $this->assertAPISuccess($result); - $this->documentMe($params, $result, __FUNCTION__, __FILE__); + $result = $this->callAPIAndDocument('address', 'getoptions', $params, __FUNCTION__, __FILE__); $this->assertTrue($result['count'] > 3, "In line " . __LINE__); $this->assertContains('Home', $result['values'], "In line " . __LINE__); $this->assertContains('Work', $result['values'], "In line " . __LINE__); $this->assertContains('Main', $result['values'], "In line " . __LINE__); $this->assertContains('Billing', $result['values'], "In line " . __LINE__); - $this->assertTrue(empty($result['is_error']), - "In line " . __LINE__ - ); } /** @@ -143,10 +127,8 @@ class api_v3_ConstantTest extends CiviUnitTestCase { public function testPhoneType() { $params = array( 'field' => 'phone_type_id', - 'version' => $this->_apiversion, ); - $result = civicrm_api('phone', 'getoptions', $params); - $this->assertAPISuccess($result); + $result = $this->callAPISuccess('phone', 'getoptions', $params); $this->assertEquals(5, $result['count'], "In line " . __LINE__); $this->assertContains('Phone', $result['values'], "In line " . __LINE__); @@ -154,10 +136,6 @@ class api_v3_ConstantTest extends CiviUnitTestCase { $this->assertContains('Fax', $result['values'], "In line " . __LINE__); $this->assertContains('Pager', $result['values'], "In line " . __LINE__); $this->assertContains('Voicemail', $result['values'], "In line " . __LINE__); - - $this->assertTrue(empty($result['is_error']), - "In line " . __LINE__ - ); } /** @@ -166,18 +144,13 @@ class api_v3_ConstantTest extends CiviUnitTestCase { public function testmailProtocol() { $params = array( 'field' => 'protocol', - 'version' => $this->_apiversion, ); - $result = civicrm_api('mail_settings', 'getoptions', $params); - $this->assertAPISuccess($result); + $result = $this->callAPISuccess('mail_settings', 'getoptions', $params); $this->assertEquals(4, $result['count'], "In line " . __LINE__); $this->assertContains('IMAP', $result['values'], "In line " . __LINE__); $this->assertContains('Maildir', $result['values'], "In line " . __LINE__); $this->assertContains('POP3', $result['values'], "In line " . __LINE__); $this->assertContains('Localdir', $result['values'], "In line " . __LINE__); - $this->assertTrue(empty($result['is_error']), - "In line " . __LINE__ - ); } } diff --git a/tests/phpunit/api/v3/ContactTypeTest.php b/tests/phpunit/api/v3/ContactTypeTest.php index f031d25dfd..60ec24befd 100644 --- a/tests/phpunit/api/v3/ContactTypeTest.php +++ b/tests/phpunit/api/v3/ContactTypeTest.php @@ -1,5 +1,4 @@ 'Grant', 'contact_type' => 'Individual', 'contact_sub_type' => $this->subTypeIndividual, - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); - $this->assertEquals($contact['is_error'], 0, "In line " . __LINE__); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - $result = civicrm_api('contact', 'get', $params); + $result = $this->callAPISuccess('contact', 'get', $params); $this->assertEquals($result['values'][$contact['id']]['first_name'], $contactParams['first_name'], "In line " . __LINE__); $this->assertEquals($result['values'][$contact['id']]['last_name'], $contactParams['last_name'], "In line " . __LINE__); $this->assertEquals($result['values'][$contact['id']]['contact_type'], $contactParams['contact_type'], "In line " . __LINE__); $this->assertEquals(end($result['values'][$contact['id']]['contact_sub_type']), $contactParams['contact_sub_type'], "In line " . __LINE__); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); // check for Type:Organization Subtype:sub_organization $contactParams = array( 'organization_name' => 'Compumentor', 'contact_type' => 'Organization', 'contact_sub_type' => $this->subTypeOrganization, - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); - $this->assertEquals($contact['is_error'], 0, "In line " . __LINE__); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - $getContacts = civicrm_api('contact', 'get', $params); + $getContacts = $this->callAPISuccess('contact', 'get', $params); $result = $getContacts['values'][$contact['id']]; $this->assertEquals($result['organization_name'], $contactParams['organization_name'], "In line " . __LINE__); $this->assertEquals($result['contact_type'], $contactParams['contact_type'], "In line " . __LINE__); $this->assertEquals(end($result['contact_sub_type']), $contactParams['contact_sub_type'], "In line " . __LINE__); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); } @@ -148,7 +141,6 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'last_name' => 'Grant', 'contact_type' => 'Individual', 'contact_sub_type' => $this->subTypeHousehold, - 'version' => $this->_apiversion, ); $contact = $this->callAPIFailure('contact', 'create', $contactParams); @@ -157,7 +149,6 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'organization_name' => 'Compumentor', 'contact_type' => 'Organization', 'contact_sub_type' => $this->subTypeIndividual, - 'version' => $this->_apiversion, ); $contact = $this->callAPIFailure('contact', 'create', $contactParams); } @@ -174,9 +165,8 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'first_name' => 'Anne', 'last_name' => 'Grant', 'contact_type' => 'Individual', - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); // subype:sub_individual $updateParams = array( 'first_name' => 'John', @@ -184,32 +174,28 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'contact_id' => $contact['id'], 'contact_type' => 'Individual', 'contact_sub_type' => $this->subTypeIndividual, - 'version' => $this->_apiversion, ); - $updateContact = civicrm_api('contact', 'create', $updateParams); - $this->assertEquals($updateContact['is_error'], 0, "In line " . __LINE__); + $updateContact = $this->callAPISuccess('contact', 'create', $updateParams); $this->assertEquals($updateContact['id'], $contact['id'], "In line " . __LINE__); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - $getContacts = civicrm_api('contact', 'get', $params); + $getContacts = $this->callAPISuccess('contact', 'get', $params); $result = $getContacts['values'][$contact['id']]; $this->assertEquals($result['first_name'], $updateParams['first_name'], "In line " . __LINE__); $this->assertEquals($result['last_name'], $updateParams['last_name'], "In line " . __LINE__); $this->assertEquals($result['contact_type'], $updateParams['contact_type'], "In line " . __LINE__); $this->assertEquals(end($result['contact_sub_type']), $updateParams['contact_sub_type'], "In line " . __LINE__); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); // check for Type:Organization $contactParams = array( 'organization_name' => 'Compumentor', 'contact_type' => 'Organization', - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); // subype:sub_organization $updateParams = array( @@ -217,24 +203,20 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'contact_id' => $contact['id'], 'contact_type' => 'Organization', 'contact_sub_type' => $this->subTypeOrganization, - 'version' => $this->_apiversion, ); - $updateContact = civicrm_api('contact', 'create', $updateParams); - - $this->assertEquals($updateContact['is_error'], 0, "In line " . __LINE__); + $updateContact = $this->callAPISuccess('contact', 'create', $updateParams); $this->assertEquals($updateContact['id'], $contact['id'], "In line " . __LINE__); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - $getContacts = civicrm_api('contact', 'get', $params); + $getContacts = $this->callAPISuccess('contact', 'get', $params); $result = $getContacts['values'][$contact['id']]; $this->assertEquals($result['organization_name'], $updateParams['organization_name'], "In line " . __LINE__); $this->assertEquals($result['contact_type'], $updateParams['contact_type'], "In line " . __LINE__); $this->assertEquals(end($result['contact_sub_type']), $updateParams['contact_sub_type'], "In line " . __LINE__); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); } @@ -248,9 +230,8 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'first_name' => 'Anne', 'last_name' => 'Grant', 'contact_type' => 'Individual', - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); // subype:sub_household $updateParams = array( @@ -259,36 +240,31 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'contact_id' => $contact['id'], 'contact_type' => 'Individual', 'contact_sub_type' => $this->subTypeHousehold, - 'version' => $this->_apiversion, ); $updateContact = $this->callAPIFailure('contact', 'create', $updateParams); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, - ); - civicrm_api('contact', 'delete', $params); + ); + $this->callAPISuccess('contact', 'delete', $params); // check for Type:Organization $contactParams = array( 'organization_name' => 'Compumentor', 'contact_type' => 'Organization', - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); $updateParams = array( 'organization_name' => 'Intel Arts', 'contact_id' => $contact['id'], 'contact_type' => 'Organization', 'contact_sub_type' => $this->subTypeIndividual, - 'version' => $this->_apiversion, ); $updateContact = $this->callAPIFailure('contact', 'create', $updateParams); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); } /* @@ -313,9 +289,8 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'last_name' => 'Grant', 'contact_type' => 'Individual', 'contact_sub_type' => $this->subTypeIndividual, - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); // subype:sub2_individual $updateParams = array( 'id' => $contact['id'], @@ -324,25 +299,22 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'contact_id' => $contact['id'], 'contact_type' => 'Individual', 'contact_sub_type' => $subtype, - 'version' => $this->_apiversion, ); - $updateContact = civicrm_api('contact', 'create', $updateParams); + $updateContact = $this->callAPISuccess('contact', 'create', $updateParams); - $this->assertEquals($updateContact['is_error'], 0, "In line " . __LINE__); $this->assertEquals($updateContact['id'], $contact['id'], "In line " . __LINE__); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - $getContacts = civicrm_api('contact', 'get', $params); + $getContacts = $this->callAPISuccess('contact', 'get', $params); $result = $getContacts['values'][$contact['id']]; $this->assertEquals($result['first_name'], $updateParams['first_name'], "In line " . __LINE__); $this->assertEquals($result['last_name'], $updateParams['last_name'], "In line " . __LINE__); $this->assertEquals($result['contact_type'], $updateParams['contact_type'], "In line " . __LINE__); $this->assertEquals(end($result['contact_sub_type']), $updateParams['contact_sub_type'], "In line " . __LINE__); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); $params = array( @@ -360,9 +332,8 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'organization_name' => 'Compumentor', 'contact_type' => 'Organization', 'contact_sub_type' => $this->subTypeOrganization, - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); // subype:sub2_organization $updateParams = array( @@ -370,24 +341,20 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'contact_id' => $contact['id'], 'contact_type' => 'Organization', 'contact_sub_type' => $subtype, - 'version' => $this->_apiversion, ); - $updateContact = civicrm_api('contact', 'create', $updateParams); - - $this->assertEquals($updateContact['is_error'], 0, "In line " . __LINE__); + $updateContact = $this->callAPISuccess('contact', 'create', $updateParams); $this->assertEquals($updateContact['id'], $contact['id'], "In line " . __LINE__); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - $getContacts = civicrm_api('contact', 'get', $params); + $getContacts = $this->callAPISuccess('contact', 'get', $params); $result = $getContacts['values'][$contact['id']]; $this->assertEquals($result['organization_name'], $updateParams['organization_name'], "In line " . __LINE__); $this->assertEquals($result['contact_type'], $updateParams['contact_type'], "In line " . __LINE__); $this->assertEquals(end($result['contact_sub_type']), $updateParams['contact_sub_type'], "In line " . __LINE__); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); } /* @@ -401,9 +368,8 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'last_name' => 'Grant', 'contact_type' => 'Individual', 'contact_sub_type' => $this->subTypeIndividual, - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); // subype:sub_household $updateParams = array( @@ -412,36 +378,31 @@ class api_v3_ContactTypeTest extends CiviUnitTestCase { 'contact_id' => $contact['id'], 'contact_type' => 'Individual', 'contact_sub_type' => $this->subTypeHousehold, - 'version' => $this->_apiversion, ); $updateContact = $this->callAPIFailure('contact', 'create', $updateParams); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); // check for Type:Organization subtype: $contactParams = array( 'organization_name' => 'Compumentor', 'contact_type' => 'Organization', 'contact_sub_type' => $this->subTypeOrganization, - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $contactParams); + $contact = $this->callAPISuccess('contact', 'create', $contactParams); $updateParams = array( 'organization_name' => 'Intel Arts', 'contact_id' => $contact['id'], 'contact_sub_type' => $this->subTypeIndividual, - 'version' => $this->_apiversion, ); $updateContact = $this->callAPIFailure('contact', 'create', $updateParams); $params = array( 'contact_id' => $contact['id'], - 'version' => $this->_apiversion, ); - civicrm_api('contact', 'delete', $params); + $this->callAPISuccess('contact', 'delete', $params); } } diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php index 0e10deea31..329a65535d 100644 --- a/tests/phpunit/api/v3/ContributionPageTest.php +++ b/tests/phpunit/api/v3/ContributionPageTest.php @@ -49,7 +49,6 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase { parent::setUp(); $this->contactIds[] = $this->individualCreate(); $this->params = array( - 'version' => $this->_apiversion, 'title' => "Test Contribution Page", 'financial_type_id' => 1, 'currency' => 'NZD', @@ -59,67 +58,52 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase { function tearDown() { foreach ($this->contactIds as $id) { - civicrm_api('contact', 'delete', array('version' => $this->_apiversion, 'id' => $id)); + $this->callAPISuccess('contact', 'delete', array('id' => $id)); + }if(!empty($this->id)){ + $this->callAPISuccess('contribution_page', 'delete', array('id' => $this->id)); } - civicrm_api('contribution_page', 'delete', array('version' => $this->_apiversion, 'id' => $this->id)); } public function testCreateContributionPage() { - $result = civicrm_api($this->_entity, 'create', $this->params); - $this->id = $result['id']; - $this->documentMe($this->params, $result, __FUNCTION__, __FILE__); - $this->assertAPISuccess($result, 'In line ' . __LINE__); - $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); - $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__); + $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params, __FUNCTION__, __FILE__); + $this->assertEquals(1, $result['count']); + $this->assertNotNull($result['values'][$result['id']]['id']); $this->getAndCheck($this->params, $result['id'], $this->_entity); } public function testGetBasicContributionPage() { - $createResult = civicrm_api($this->_entity, 'create', $this->params); + $createResult = $this->callAPISuccess($this->_entity, 'create', $this->params); $this->id = $createResult['id']; - $this->assertAPISuccess($createResult); $getParams = array( - 'version' => $this->_apiversion, 'currency' => 'NZD', 'financial_type_id' => 1, ); - $getResult = civicrm_api($this->_entity, 'get', $getParams); - $this->documentMe($getParams, $getResult, __FUNCTION__, __FILE__); - $this->assertAPISuccess($getResult, 'In line ' . __LINE__); - $this->assertEquals(1, $getResult['count'], 'In line ' . __LINE__); + $getResult = $this->callAPIAndDocument($this->_entity, 'get', $getParams, __FUNCTION__, __FILE__); + $this->assertEquals(1, $getResult['count']); } public function testGetContributionPageByAmount() { - $createResult = civicrm_api($this->_entity, 'create', $this->params); + $createResult = $this->callAPISuccess($this->_entity, 'create', $this->params); $this->id = $createResult['id']; - $this->assertAPISuccess($createResult); $getParams = array( - 'version' => $this->_apiversion, 'amount' => ''. $this->testAmount, // 3456 'currency' => 'NZD', 'financial_type_id' => 1, ); - $getResult = civicrm_api($this->_entity, 'get', $getParams); - $this->documentMe($getParams, $getResult, __FUNCTION__, __FILE__); - $this->assertAPISuccess($getResult, 'In line ' . __LINE__); - $this->assertEquals(1, $getResult['count'], 'In line ' . __LINE__); + $getResult = $this->callAPIAndDocument($this->_entity, 'get', $getParams, __FUNCTION__, __FILE__); + $this->assertEquals(1, $getResult['count']); } public function testDeleteContributionPage() { - $createResult = civicrm_api($this->_entity, 'create', $this->params); - $deleteParams = array('version' => $this->_apiversion, 'id' => $createResult['id']); - $deleteResult = civicrm_api($this->_entity, 'delete', $deleteParams); - $this->documentMe($deleteParams, $deleteResult, __FUNCTION__, __FILE__); - $this->assertAPISuccess($deleteResult, 'In line ' . __LINE__); - $checkDeleted = civicrm_api($this->_entity, 'get', array( - 'version' => $this->_apiversion, - )); - $this->assertEquals(0, $checkDeleted['count'], 'In line ' . __LINE__); + $createResult = $this->callAPISuccess($this->_entity, 'create', $this->params); + $deleteParams = array('id' => $createResult['id']); + $deleteResult = $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__); + $checkDeleted = $this->callAPISuccess($this->_entity, 'get', array()); + $this->assertEquals(0, $checkDeleted['count']); } public function testGetFieldsContributionPage() { - $result = civicrm_api($this->_entity, 'getfields', array('version' => $this->_apiversion, 'action' => 'create')); - $this->assertAPISuccess($result, 'In line ' . __LINE__); + $result = $this->callAPISuccess($this->_entity, 'getfields', array('action' => 'create')); $this->assertEquals(12, $result['values']['start_date']['type']); } diff --git a/tests/phpunit/api/v3/ContributionRecurTest.php b/tests/phpunit/api/v3/ContributionRecurTest.php index 3710cc3f48..43795c356a 100644 --- a/tests/phpunit/api/v3/ContributionRecurTest.php +++ b/tests/phpunit/api/v3/ContributionRecurTest.php @@ -48,7 +48,6 @@ class api_v3_ContributionRecurTest extends CiviUnitTestCase { parent::setUp(); $this->ids['contact'][0] = $this->individualCreate(); $this->params = array( - 'version' => 3, 'contact_id' => $this->ids['contact'][0], 'installments' => '12', 'frequency_interval' => '1', @@ -63,7 +62,7 @@ class api_v3_ContributionRecurTest extends CiviUnitTestCase { function tearDown() { foreach ($this->ids as $entity => $entities) { foreach ($entities as $id) { - civicrm_api($entity, 'delete', array('version' => $this->_apiversion, 'id' => $id)); + $this->callAPISuccess($entity, 'delete', array('id' => $id)); } } $tablesToTruncate = array( @@ -76,41 +75,32 @@ class api_v3_ContributionRecurTest extends CiviUnitTestCase { } public function testCreateContributionRecur() { - $result = civicrm_api($this->_entity, 'create', $this->params); - $this->documentMe($this->params, $result, __FUNCTION__, __FILE__); - $this->assertAPISuccess($result, 'In line ' . __LINE__); - $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); - $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__); + $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params, __FUNCTION__, __FILE__); + $this->assertEquals(1, $result['count']); + $this->assertNotNull($result['values'][$result['id']]['id']); $this->getAndCheck($this->params, $result['id'], $this->_entity); } public function testGetContributionRecur() { - $result = civicrm_api($this->_entity, 'create', $this->params); + $result = $this->callAPISuccess($this->_entity, 'create', $this->params); $getParams = array( - 'version' => $this->_apiversion, 'amount' => '500', ); - $result = civicrm_api($this->_entity, 'get', $getParams); - $this->documentMe($getParams, $result, __FUNCTION__, __FILE__); - $this->assertAPISuccess($result, 'In line ' . __LINE__); - $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); + $result = $this->callAPIAndDocument($this->_entity, 'get', $getParams, __FUNCTION__, __FILE__); + $this->assertEquals(1, $result['count']); } public function testDeleteContributionRecur() { - $result = civicrm_api($this->_entity, 'create', $this->params); - $deleteParams = array('version' => 3, 'id' => $result['id']); - $result = civicrm_api($this->_entity, 'delete', $deleteParams); - $this->documentMe($deleteParams, $result, __FUNCTION__, __FILE__); - $this->assertAPISuccess($result, 'In line ' . __LINE__); - $checkDeleted = civicrm_api($this->_entity, 'get', array( - 'version' => 3, + $result = $this->callAPISuccess($this->_entity, 'create', $this->params); + $deleteParams = array('id' => $result['id']); + $result = $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__); + $checkDeleted = $this->callAPISuccess($this->_entity, 'get', array( )); - $this->assertEquals(0, $checkDeleted['count'], 'In line ' . __LINE__); + $this->assertEquals(0, $checkDeleted['count']); } public function testGetFieldsContributionRecur() { - $result = civicrm_api($this->_entity, 'getfields', array('version' => 3, 'action' => 'create')); - $this->assertAPISuccess($result, 'In line ' . __LINE__); + $result = $this->callAPISuccess($this->_entity, 'getfields', array('action' => 'create')); $this->assertEquals(12, $result['values']['start_date']['type']); } } diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php index f69f043ea5..665e6535ce 100644 --- a/tests/phpunit/api/v3/ContributionTest.php +++ b/tests/phpunit/api/v3/ContributionTest.php @@ -638,8 +638,9 @@ class api_v3_ContributionTest extends CiviUnitTestCase { function testContributionCreateExample() { //make sure at least on page exists since there is a truncate in tear down $page = $this->callAPISuccess('contribution_page', 'create', $this->_pageParams); + $this->assertAPISuccess($page); require_once 'api/v3/examples/ContributionCreate.php'; - $result = contribution_create_example(); + $result = contribution_create_example(); $this->assertAPISuccess($result); $contributionId = $result['id']; $expectedResult = contribution_create_expectedresult(); @@ -697,6 +698,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { function testCreateContributionOnline() { $paymentProcessor = CRM_Financial_BAO_PaymentProcessor::create($this->_processorParams); $contributionPage = $this->callAPISuccess( 'contribution_page','create', $this->_pageParams ); + $this->assertAPISuccess($contributionPage); $params = array( 'contact_id' => $this->_individualId, 'receive_date' => '20120511', @@ -750,6 +752,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { $paymentProcessor = CRM_Financial_BAO_PaymentProcessor::create($this->_processorParams); $this->_pageParams['is_pay_later'] = 1; $contributionPage = $this->callAPISuccess( 'contribution_page','create',$this->_pageParams ); + $this->assertAPISuccess($contributionPage); $params = array( 'contact_id' => $this->_individualId, 'receive_date' => '20120511', @@ -782,6 +785,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { function testCreateContributionPendingOnline() { $paymentProcessor = CRM_Financial_BAO_PaymentProcessor::create($this->_processorParams); $contributionPage = $this->callAPISuccess( 'contribution_page', 'create', $this->_pageParams ); + $this->assertAPISuccess($contributionPage); $params = array( 'contact_id' => $this->_individualId, 'receive_date' => '20120511', @@ -890,6 +894,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { 'payment_instrument_id' => $instrumentId,) ); $contribution = $this->callAPISuccess('contribution', 'update', $newParams); + $this->assertAPISuccess($contribution); $this->_checkFinancialTrxn($contribution, 'paymentInstrument'); } @@ -1001,6 +1006,8 @@ class api_v3_ContributionTest extends CiviUnitTestCase { ); $original = $this->callAPISuccess('contribution', 'get', $old_params); + //Make sure it came back + $this->assertAPISuccess($original, 'In line ' . __LINE__); $this->assertEquals($original['id'], $contributionID, 'In line ' . __LINE__); //set up list of old params, verify @@ -1059,6 +1066,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { ); $result = $this->callAPISuccess('contribution', 'delete', $params); + $this->assertAPISuccess($result, 'in line' . __LINE__); } ///////////////// civicrm_contribution_delete methods @@ -1315,6 +1323,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { if ($delete) { $this->callAPISuccess('contribution', 'delete', array('id' => $id)); } + $this->assertAPISuccess($contribution, 0, 'In line ' . __LINE__); $values = $contribution['values'][$contribution['id']]; $params['receive_date'] = date('Y-m-d H:i:s', strtotime($params['receive_date'])); // this is not returned in id format diff --git a/tests/phpunit/api/v3/CustomSearchTest.php b/tests/phpunit/api/v3/CustomSearchTest.php index bbade40886..654f98e493 100644 --- a/tests/phpunit/api/v3/CustomSearchTest.php +++ b/tests/phpunit/api/v3/CustomSearchTest.php @@ -13,8 +13,7 @@ class api_v3_CustomSearchTest extends CiviUnitTestCase { function tearDown() {} public function testCustomSearch() { - $result = civicrm_api('CustomSearch', 'create', array( - 'version' => $this->_apiversion, + $result = $this->callAPISuccess('CustomSearch', 'create', array( 'label' => 'Invalid, overwritten', 'description' => 'Longish description of the example search form', 'class_name' => 'CRM_Contact_Form_Search_Custom_Examplez', @@ -31,12 +30,11 @@ class api_v3_CustomSearchTest extends CiviUnitTestCase { WHERE name = "CRM_Contact_Form_Search_Custom_Examplez"'); // deactivate - $result = civicrm_api('CustomSearch', 'create', array( - 'version' => $this->_apiversion, + $result = $this->callAPISuccess('CustomSearch', 'create', array( 'id' => $entityId, 'is_active' => 0, )); - $this->assertAPISuccess($result); + $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); $this->assertDBQuery(1, 'SELECT count(*) FROM civicrm_option_value WHERE name = "CRM_Contact_Form_Search_Custom_Examplez" @@ -46,12 +44,11 @@ class api_v3_CustomSearchTest extends CiviUnitTestCase { WHERE name = "CRM_Contact_Form_Search_Custom_Examplez"'); // activate - $result = civicrm_api('CustomSearch', 'create', array( - 'version' => $this->_apiversion, + $result = $this->callAPISuccess('CustomSearch', 'create', array( 'id' => $entityId, 'is_active' => 1, )); - $this->assertAPISuccess($result); + $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); $this->assertDBQuery(1, 'SELECT count(*) FROM civicrm_option_value WHERE name = "CRM_Contact_Form_Search_Custom_Examplez" @@ -60,11 +57,9 @@ class api_v3_CustomSearchTest extends CiviUnitTestCase { $this->assertDBQuery(1, 'SELECT is_active FROM civicrm_option_value WHERE name = "CRM_Contact_Form_Search_Custom_Examplez"'); - $result = civicrm_api('CustomSearch', 'delete', array( - 'version' => $this->_apiversion, + $result = $this->callAPISuccess('CustomSearch', 'delete', array( 'id' => $entityId, )); - $this->assertAPISuccess($result); $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); $this->assertDBQuery(0, 'SELECT count(*) FROM civicrm_option_value WHERE name = "CRM_Contact_Form_Search_Custom_Examplez" diff --git a/tests/phpunit/api/v3/CustomValueContactTypeTest.php b/tests/phpunit/api/v3/CustomValueContactTypeTest.php index e85e5a573c..38134be5ed 100644 --- a/tests/phpunit/api/v3/CustomValueContactTypeTest.php +++ b/tests/phpunit/api/v3/CustomValueContactTypeTest.php @@ -36,7 +36,7 @@ require_once 'CiviTest/CiviUnitTestCase.php'; class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { protected $_contactID; - protected $_apiversion; + protected $_apiversion =3; protected $CustomGroupIndividual; protected $individualStudent; public $_eNoticeCompliant = TRUE; @@ -50,15 +50,13 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { } function setUp() { - parent::setUp(); - $this->_apiversion = 3; // Create Group For Individual Contact Type - $groupIndividual = array('title' => 'TestGroup For Indivi' . substr(sha1(rand()), 0, 5), + $groupIndividual = array( + 'title' => 'TestGroup For Indivi' . substr(sha1(rand()), 0, 5), 'extends' => array('Individual'), 'style' => 'Inline', 'is_active' => 1, - 'version' => $this->_apiversion, ); $this->CustomGroupIndividual = $this->customGroupCreate($groupIndividual); @@ -71,7 +69,6 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'extends' => array('Individual', array('Student')), 'style' => 'Inline', 'is_active' => 1, - 'version' => $this->_apiversion, ); $this->CustomGroupIndiStudent = $this->customGroupCreate($groupIndiStudent); @@ -82,7 +79,6 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'first_name' => 'Mathev', 'last_name' => 'Adison', 'contact_type' => 'Individual', - 'version' => $this->_apiversion, ); $this->individual = $this->individualCreate($params); @@ -92,7 +88,6 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'last_name' => 'Tosun', 'contact_type' => 'Individual', 'contact_sub_type' => 'Student', - 'version' => $this->_apiversion, ); $this->individualStudent = $this->individualCreate($params); @@ -101,14 +96,12 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'last_name' => 'Dawson', 'contact_type' => 'Individual', 'contact_sub_type' => 'Parent', - 'version' => $this->_apiversion, ); $this->individualParent = $this->individualCreate($params); $params = array( 'organization_name' => 'Wellspring', 'contact_type' => 'Organization', - 'version' => $this->_apiversion, ); $this->organization = $this->organizationCreate($params); @@ -116,7 +109,6 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'organization_name' => 'SubUrban', 'contact_type' => 'Organization', 'contact_sub_type' => 'Sponsor', - 'version' => $this->_apiversion, ); $this->organizationSponsor = $this->organizationCreate($params); //refresh php cached variables @@ -133,14 +125,13 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { * Test that custom fields is returned for correct contact type only */ function testGetFields() { - $result = civicrm_api('Contact', 'getfields', array('version' => 3)); - $this->assertAPISuccess($result); + $result = $this->callAPISuccess('Contact', 'getfields', array()); $this->assertArrayHasKey("custom_{$this->IndividualField['id']}", $result['values'], 'If This fails there is probably a cachine issue - failure in line' . __LINE__ . print_r(array_keys($result['values']), TRUE)); - $result = civicrm_api('Contact', 'getfields', array('version' => 3, 'action' => 'create', 'contact_type' => 'Individual'), 'in line' . __LINE__); + $result = $this->callAPISuccess('Contact', 'getfields', array('action' => 'create', 'contact_type' => 'Individual'), 'in line' . __LINE__); $this->assertArrayHasKey("custom_{$this->IndividualField['id']}", $result['values']); - $result = civicrm_api('Contact', 'getfields', array('version' => 3, 'action' => 'create', 'contact_type' => 'Organization')); + $result = $this->callAPISuccess('Contact', 'getfields', array('action' => 'create', 'contact_type' => 'Organization')); $this->assertArrayNotHasKey("custom_{$this->IndividualField['id']}", $result['values'], 'in line' . __LINE__ . print_r(array_keys($result['values']), TRUE)); - $result = civicrm_api('Relationship', 'getfields', array('version' => 3, 'action' => 'create'), 'in line' . __LINE__); + $result = $this->callAPISuccess('Relationship', 'getfields', array('action' => 'create'), 'in line' . __LINE__); $this->assertArrayNotHasKey("custom_{$this->IndividualField['id']}", $result['values']); } @@ -152,26 +143,22 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { $params = array( 'id' => $this->organization, 'contact_type' => 'Organization', - "custom_{$this->IndividualField['id']}" => 'Test String', - 'version' => $this->_apiversion, - 'debug' => 1,// so that undefined_fields is returned + "custom_{$this->IndividualField['id']}" => 'Test String', 'debug' => 1,// so that undefined_fields is returned ); - $contact = civicrm_api('contact', 'create', $params); + $contact = $this->callAPISuccess('contact', 'create', $params); $this->assertTrue(is_array($contact['undefined_fields']), __LINE__); $this->assertTrue(in_array("custom_{$this->IndividualField['id']}", $contact['undefined_fields']), __LINE__); } /** * Add valid Empty params to a Contact Type : Individual + * note - don't copy & paste this - is of marginal value */ function testAddCustomDataEmptyToIndividual() { - - $params = array( - 'version' => 3, - ); - $contact = $this->callAPIFailure('contact', 'create', $params); - $this->assertEquals($contact['error_message'], 'Mandatory key(s) missing from params array: contact_type'); + $contact = $this->callAPIFailure('contact', 'create', array(), + 'Mandatory key(s) missing from params array: contact_type' + ); } /** @@ -183,9 +170,8 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'contact_id' => $this->individual, 'contact_type' => 'Individual', "custom_{$this->IndividualField['id']}" => 'Test String', - 'version' => $this->_apiversion, ); - $contact = civicrm_api('contact', 'create', $params); + $contact = $this->callAPISuccess('contact', 'create', $params); $this->assertNotNull($contact['id'], 'In line ' . __LINE__); $entityValues = CRM_Core_BAO_CustomValueTable::getEntityValues($this->individual); @@ -204,11 +190,10 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'contact_id' => $this->organizationSponsor, 'contact_type' => 'Organization', "custom_{$this->IndiStudentField['id']}" => 'Test String', - 'version' => $this->_apiversion, 'debug' => 1,// so that undefined_fields is returned ); - $contact = civicrm_api('contact', 'create', $params); + $contact = $this->callAPISuccess('contact', 'create', $params); $this->assertTrue(is_array($contact['undefined_fields']), __LINE__); $this->assertTrue(in_array("custom_{$this->IndiStudentField['id']}", $contact['undefined_fields']), __LINE__); } @@ -221,11 +206,9 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { $params = array( 'contact_id' => $this->individualStudent, 'contact_type' => 'Individual', - "custom_{$this->IndiStudentField['id']}" => 'Test String', - 'version' => $this->_apiversion, - ); + "custom_{$this->IndiStudentField['id']}" => 'Test String', ); - $result = civicrm_api('contact', 'create', $params); + $result = $this->callAPISuccess('contact', 'create', $params); $this->assertNotNull($result['id'], 'In line ' . __LINE__); $entityValues = CRM_Core_BAO_CustomValueTable::getEntityValues($this->individualStudent); @@ -243,11 +226,9 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { $params = array( 'contact_id' => $this->individualParent, 'contact_type' => 'Individual', - "custom_{$this->IndiStudentField['id']}" => 'Test String', - 'version' => $this->_apiversion, - 'debug' => 1,// so that undefined_fields is returned + "custom_{$this->IndiStudentField['id']}" => 'Test String', 'debug' => 1,// so that undefined_fields is returned ); - $contact = civicrm_api('contact', 'create', $params); + $contact = $this->callAPISuccess('contact', 'create', $params); $this->assertTrue(is_array($contact['undefined_fields']), __LINE__); $this->assertTrue(in_array("custom_{$this->IndiStudentField['id']}", $contact['undefined_fields']), __LINE__); } @@ -264,21 +245,18 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { $params = array( 'contact_id' => $this->individual, 'contact_type' => 'Individual', - "custom_" . $this->IndividualField['id'] => 'Test String', - 'version' => $this->_apiversion, - ); + "custom_" . $this->IndividualField['id'] => 'Test String', ); - $contact = civicrm_api('contact', 'create', $params); + $contact = $this->callAPISuccess('contact', 'create', $params); $this->assertAPISuccess($contact); $params = array( 'contact_id' => $this->individual, 'contact_type' => 'Individual', "return.custom_{$this->IndividualField['id']}" => 1, - 'version' => $this->_apiversion, ); - $getContact = civicrm_api('contact', 'get', $params); + $getContact = $this->callAPISuccess('contact', 'get', $params); $this->assertEquals($getContact['values'][$this->individual]["custom_" . $this->IndividualField['id']], 'Test String', 'In line ' . __LINE__); } @@ -292,21 +270,17 @@ class api_v3_CustomValueContactTypeTest extends CiviUnitTestCase { 'contact_id' => $this->individualStudent, 'contact_type' => 'Individual', 'contact_sub_type' => 'Student', - "custom_{$this->IndiStudentField['id']}" => 'Test String', - 'version' => $this->_apiversion, - ); + "custom_{$this->IndiStudentField['id']}" => 'Test String', ); - $contact = civicrm_api('contact', 'create', $params); + $contact = $this->callAPISuccess('contact', 'create', $params); $this->assertAPISuccess($contact); $params = array( 'contact_id' => $this->individualStudent, 'contact_type' => 'Individual', - 'contact_sub_type' => 'Student', - 'version' => $this->_apiversion, - "return.custom_{$this->IndiStudentField['id']}" => 1, + 'contact_sub_type' => 'Student', "return.custom_{$this->IndiStudentField['id']}" => 1, ); - $getContact = civicrm_api('contact', 'get', $params); + $getContact = $this->callAPISuccess('contact', 'get', $params); $this->assertEquals($getContact['values'][$this->individualStudent]["custom_{$this->IndiStudentField['id']}"], 'Test String', 'In line ' . __LINE__); diff --git a/tests/phpunit/api/v3/CustomValueTest.php b/tests/phpunit/api/v3/CustomValueTest.php index 84fe22dab0..1b0c86aa4b 100644 --- a/tests/phpunit/api/v3/CustomValueTest.php +++ b/tests/phpunit/api/v3/CustomValueTest.php @@ -1,6 +1,5 @@ _apiversion = 3; $this->individual = $this->individualCreate(); $this->params = array( - 'version' => $this->_apiversion, 'entity_id' => $this->individual, ); $this->ids['single'] = $this->entityCustomGroupWithSingleFieldCreate('mySingleField', 'Contacts'); @@ -65,10 +62,10 @@ class api_v3_CustomValueTest extends CiviUnitTestCase { $params = array( 'custom_' . $this->ids['single']['custom_field_id'] => 'customString') + $this->params; - $result = civicrm_api('custom_value', 'create', $params); + $result = $this->callAPISuccess('custom_value', 'create', $params); $this->assertAPISuccess($result, 'In line ' . __LINE__); $this->assertEquals(1, $result['count'], 'In line ' . __LINE__); - $result = civicrm_api('custom_value', 'get', $params); + $result = $this->callAPISuccess('custom_value', 'get', $params); } public function testGetMultipleCustomValues() { @@ -80,7 +77,6 @@ class api_v3_CustomValueTest extends CiviUnitTestCase { 'last_name' => 'xyz3', 'contact_type' => 'Individual', 'email' => 'man3@yahoo.com', - 'version' => $this->_apiversion, 'custom_' . $this->ids['single']['custom_field_id'] => "value 1", 'custom_' . $this->ids['multi']['custom_field_id'][0] => "value 2", 'custom_' . $this->ids['multi']['custom_field_id'][1] => "warm beer", @@ -89,14 +85,13 @@ class api_v3_CustomValueTest extends CiviUnitTestCase { ); - $result = civicrm_api('Contact', 'create', $params); + $result = $this->callAPISuccess('Contact', 'create', $params); $this->assertAPISuccess($result, __LINE__); $contact_id = $result['id']; - $result = civicrm_api('Contact', 'create', + $result = $this->callAPISuccess('Contact', 'create', array( 'contact_type' => 'Individual', 'id' => $contact_id, - 'version' => 3, 'custom_' . $this->ids['multi']['custom_field_id'][0] => "value 3", 'custom_' . $this->ids['multi2']['custom_field_id'][0] => "coffee", 'custom_' . $this->ids['multi2']['custom_field_id'][1] => "value 4", @@ -104,20 +99,16 @@ class api_v3_CustomValueTest extends CiviUnitTestCase { ); $params = array( - 'id' => $result['id'], 'version' => 3, + 'id' => $result['id'], 'entity_id' => $result['id'], ); - $result = civicrm_api('CustomValue', 'Get', $params); - - $this->documentMe($params, $result, __FUNCTION__, __FILE__, $description); + $result = $this->callAPIAndDocument('CustomValue', 'Get', $params, __FUNCTION__, __FILE__, $description); $params['format.field_names'] = 1; - $resultformatted = civicrm_api('CustomValue', 'Get', $params); - $this->documentMe($params, $resultformatted, __FUNCTION__, __FILE__, "utilises field names", 'formatFieldName'); + $resultformatted = $this->callAPIAndDocument('CustomValue', 'Get', $params, __FUNCTION__, __FILE__, "utilises field names", 'formatFieldName'); // delete the contact - civicrm_api('contact', 'delete', array('version' => 1, 'id' => $contact_id)); + $this->callAPISuccess('contact', 'delete', array('id' => $contact_id)); - $this->assertAPISuccess( $result); $this->assertEquals('coffee', $result['values'][$this->ids['multi2']['custom_field_id'][0]]['2'], "In line " . __LINE__); $this->assertEquals('coffee', $result['values'][$this->ids['multi2']['custom_field_id'][0]]['latest'], "In line " . __LINE__); $this->assertEquals($this->ids['multi2']['custom_field_id'][0], $result['values'][$this->ids['multi2']['custom_field_id'][0]]['id'], "In line " . __LINE__); @@ -127,31 +118,5 @@ class api_v3_CustomValueTest extends CiviUnitTestCase { $this->assertEquals('value 1', $result['values'][$this->ids['single']['custom_field_id']]['latest'], "In line " . __LINE__); $this->assertEquals('value 1', $resultformatted['values']['mySingleField']['latest'], "In line " . __LINE__); } - /* - public function testDeleteCustomValue () { - $entity = civicrm_api('custom_value','get',$this->params); - $result = civicrm_api('custom_value','delete',array('version' =>3,'id' => $entity['id'])); - $this->documentMe($this->params,$result,__FUNCTION__,__FILE__); - $this->assertAPISuccess($result, 'In line ' . __LINE__ ); - $checkDeleted = civicrm_api('survey','get',array('version' =>3,)); - $this->assertEquals( 0, $checkDeleted['count'], 'In line ' . __LINE__ ); - - } - - public function testGetCustomValueChainDelete () { - $description = "demonstrates get + delete in the same call"; - $subfile = 'ChainedGetDelete'; - $params = array( - 'version' =>3, - 'title' => "survey title", - 'api.survey.delete' => 1); - $result = civicrm_api('survey','create',$this->params); - $result = civicrm_api('survey','get',$params ); - $this->documentMe($params,$result,__FUNCTION__,__FILE__,$description,$subfile); - $this->assertAPISuccess($result, 'In line ' . __LINE__ ); - $this->assertEquals( 0,civicrm_api('survey','getcount',array('version' => 3)), 'In line ' . __LINE__ ); - - } - */ } diff --git a/tests/phpunit/api/v3/DomainTest.php b/tests/phpunit/api/v3/DomainTest.php index deaf5de817..b01ec6e01f 100644 --- a/tests/phpunit/api/v3/DomainTest.php +++ b/tests/phpunit/api/v3/DomainTest.php @@ -1,5 +1,4 @@ $this->_apiversion, + $domContact = $this->callAPISuccess('contact', 'create', array( 'contact_type' => 'Organization', 'organization_name' => 'new org', 'api.phone.create' => array( @@ -90,17 +88,14 @@ class api_v3_DomainTest extends CiviUnitTestCase { ) ); - civicrm_api('domain','create',array( + $this->callAPISuccess('domain','create',array( 'id' => 1, 'contact_id' => $domContact['id'], - 'version' => $this->_apiversion ) ); - $this->_apiversion = 3; $this->params = array( 'name' => 'A-team domain', 'description' => 'domain of chaos', - 'version' => $this->_apiversion, 'domain_version' => '4.2', 'contact_id' => $domContact['id'], ); @@ -124,10 +119,8 @@ class api_v3_DomainTest extends CiviUnitTestCase { */ public function testGet() { - - $params = array('version' => 3, 'sequential' => 1,); - $result = civicrm_api('domain', 'get', $params); - $this->documentMe($params, $result, __FUNCTION__, __FILE__); + $params = array('sequential' => 1,); + $result = $this->callAPIAndDocument('domain', 'get', $params, __FUNCTION__, __FILE__); $this->assertType('array', $result, 'In line' . __LINE__); @@ -144,8 +137,8 @@ class api_v3_DomainTest extends CiviUnitTestCase { } public function testGetCurrentDomain() { - $params = array('version' => 3, 'current_domain' => 1); - $result = civicrm_api('domain', 'get', $params); + $params = array('current_domain' => 1); + $result = $this->callAPISuccess('domain', 'get', $params); $this->assertType('array', $result, 'In line' . __LINE__); @@ -178,14 +171,12 @@ class api_v3_DomainTest extends CiviUnitTestCase { public function testGetCurrentDomainTwice() { - $domain = civicrm_api('domain', 'getvalue', array( - 'version' => 3, + $domain = $this->callAPISuccess('domain', 'getvalue', array( 'current_domain' => 1, 'return' => 'name', )); $this->assertEquals('Default Domain Name', $domain, print_r($domain, TRUE) . 'in line ' . __LINE__); - $domain = civicrm_api('domain', 'getvalue', array( - 'version' => 3, + $domain = $this->callAPISuccess('domain', 'getvalue', array( 'current_domain' => 1, 'return' => 'name', )); @@ -196,9 +187,7 @@ class api_v3_DomainTest extends CiviUnitTestCase { * Test civicrm_domain_create. */ public function testCreate() { - $result = civicrm_api('domain', 'create', $this->params); - $this->documentMe($this->params, $result, __FUNCTION__, __FILE__); - $this->assertAPISuccess($result); + $result = $this->callAPIAndDocument('domain', 'create', $this->params, __FUNCTION__, __FILE__); $this->assertEquals($result['count'], 1); $this->assertNotNull($result['id']); $this->assertEquals($result['values'][$result['id']]['name'], $this->params['name']); @@ -210,22 +199,7 @@ class api_v3_DomainTest extends CiviUnitTestCase { * Error expected. */ public function testCreateWithEmptyParams() { - $params = array('version' => $this->_apiversion); - $result = civicrm_api('domain', 'create', $params); - $this->assertAPIFailure($result, - "In line " . __LINE__ - ); - } - - /** - * Test civicrm_domain_create with wrong parameter type. - */ - public function testCreateWithWrongParams() { - $params = 1; - $result = civicrm_api('domain', 'create', $params); - $this->assertAPIFailure($result, - "In line " . __LINE__ - ); + $result = $this->callAPIFailure('domain', 'create', array()); } } diff --git a/tests/phpunit/api/v3/EntityTagTest.php b/tests/phpunit/api/v3/EntityTagTest.php index ef387e106e..253e9e9b4e 100644 --- a/tests/phpunit/api/v3/EntityTagTest.php +++ b/tests/phpunit/api/v3/EntityTagTest.php @@ -42,15 +42,12 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { protected $_householdID; protected $_organizationID; protected $_tagID; - protected $_apiversion; + protected $_apiversion = 3; protected $_tag; public $_eNoticeCompliant = TRUE; function setUp() { parent::setUp(); - $this->_apiversion = 3; - - $this->quickCleanup(array('civicrm_tag', 'civicrm_entity_tag')); $this->_individualID = $this->individualCreate(NULL); $this->_tag = $this->tagCreate(NULL); @@ -59,43 +56,40 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { $this->_organizationID = $this->organizationCreate(NULL); } - function tearDown() {} + function tearDown() { + $this->quickCleanup(array('civicrm_tag', 'civicrm_entity_tag')); + } function testAddEmptyParams() { - $params = array('version' => $this->_apiversion); - $individualEntity = $this->callAPIFailure('entity_tag', 'create', $params); - $this->assertEquals($individualEntity['error_message'], 'contact_id is a required field'); + $individualEntity = $this->callAPIFailure('entity_tag', 'create', $params = array(), + 'contact_id is a required field' + ); } function testAddWithoutTagID() { $params = array( 'contact_id' => $this->_individualID, - 'version' => $this->_apiversion, ); - $individualEntity = $this->callAPIFailure('entity_tag', 'create', $params); - $this->assertEquals($individualEntity['error_message'], 'tag_id is a required field'); + $individualEntity = $this->callAPIFailure('entity_tag', 'create', $params, + 'tag_id is a required field' + ); } function testAddWithoutContactID() { $params = array( 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $individualEntity = $this->callAPIFailure('entity_tag', 'create', $params); - $this->assertEquals($individualEntity['error_message'], 'contact_id is a required field'); + $individualEntity = $this->callAPIFailure('entity_tag', 'create', $params, + 'contact_id is a required field'); } function testContactEntityTagCreate() { $params = array( 'contact_id' => $this->_individualID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $result = civicrm_api('entity_tag', 'create', $params); - $this->documentMe($params, $result, __FUNCTION__, __FILE__); - - $this->assertAPISuccess($result); + $result = $this->callAPIAndDocument('entity_tag', 'create', $params, __FUNCTION__, __FILE__); $this->assertEquals($result['added'], 1); } @@ -106,23 +100,19 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { $params = array( 'contact_id' => $individualId, 'tag_id' => $tagID, - 'version' => $this->_apiversion, ); - $result = civicrm_api('entity_tag', 'create', $params); + $result = $this->callAPISuccess('entity_tag', 'create', $params); - $this->assertAPISuccess($result); $this->assertEquals($result['added'], 1); $params = array( 'contact_id_i' => $individualId, 'contact_id_o' => $organizationId, 'tag_id' => $tagID, - 'version' => $this->_apiversion, ); - $result = civicrm_api('entity_tag', 'create', $params); - $this->assertAPISuccess($result); + $result = $this->callAPISuccess('entity_tag', 'create', $params); $this->assertEquals($result['added'], 1); $this->assertEquals($result['not_added'], 1); } @@ -134,27 +124,17 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { $params = array( 'contact_id' => $ContactId, 'tag_id' => $tagID, - 'version' => $this->_apiversion, ); - $individualEntity = civicrm_api('entity_tag', 'create', $params); - $this->assertEquals($individualEntity['is_error'], 0); + $individualEntity = $this->callAPISuccess('entity_tag', 'create', $params); $this->assertEquals($individualEntity['added'], 1); - - $paramsEntity = "wrong params"; - $entity = civicrm_api('entity_tag', 'get', $paramsEntity); - - $this->assertEquals($entity['is_error'], 1, - "In line " . __LINE__ - ); - $this->assertEquals($entity['error_message'], 'Input variable `params` is not an array'); } function testIndividualEntityTagGetWithoutContactID() { - $paramsEntity = array('version' => $this->_apiversion); - $entity = $this->callAPIFailure('entity_tag', 'get', $paramsEntity); - $this->assertNotNull($entity['error_message']); - $this->assertEquals($entity['error_message'], 'Mandatory key(s) missing from params array: entity_id'); + $paramsEntity = array(); + $entity = $this->callAPIFailure('entity_tag', 'get', $paramsEntity, + 'Mandatory key(s) missing from params array: entity_id' + ); } function testIndividualEntityTagGet() { @@ -163,24 +143,19 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { $params = array( 'contact_id' => $contactId, 'tag_id' => $tagID, - 'version' => $this->_apiversion, ); - $individualEntity = civicrm_api('entity_tag', 'create', $params); - $this->assertEquals($individualEntity['is_error'], 0); + $individualEntity = $this->callAPISuccess('entity_tag', 'create', $params); $this->assertEquals($individualEntity['added'], 1); $paramsEntity = array( 'contact_id' => $contactId, - 'version' => $this->_apiversion, ); - $entity = civicrm_api('entity_tag', 'get', $paramsEntity); + $entity = $this->callAPISuccess('entity_tag', 'get', $paramsEntity); } function testHouseholdEntityGetWithoutContactID() { - $paramsEntity = array('version' => $this->_apiversion); - $entity = $this->callAPIFailure('entity_tag', 'get', $paramsEntity); - $this->assertNotNull($entity['error_message']); + $entity = $this->callAPIFailure('entity_tag', 'get', array()); } function testHouseholdEntityGet() { @@ -189,21 +164,14 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { $params = array( 'contact_id' => $ContactId, 'tag_id' => $tagID, - 'version' => $this->_apiversion, ); - $householdEntity = civicrm_api('entity_tag', 'create', $params); - $this->assertEquals($householdEntity['is_error'], 0); + $householdEntity = $this->callAPISuccess('entity_tag', 'create', $params); $this->assertEquals($householdEntity['added'], 1); - - $paramsEntity = array('contact_id' => $ContactId); - $entity = civicrm_api('entity_tag', 'get', $paramsEntity); } function testOrganizationEntityGetWithoutContactID() { - $paramsEntity = array('version' => $this->_apiversion); - $entity = $this->callAPIFailure('entity_tag', 'get', $paramsEntity); - $this->assertNotNull($entity['error_message']); + $entity = $this->callAPIFailure('entity_tag', 'get', array()); } function testOrganizationEntityGet() { @@ -212,15 +180,13 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { $params = array( 'contact_id' => $ContactId, 'tag_id' => $tagID, - 'version' => $this->_apiversion, ); - $organizationEntity = civicrm_api('entity_tag', 'create', $params); - $this->assertEquals($organizationEntity['is_error'], 0); + $organizationEntity = $this->callAPISuccess('entity_tag', 'create', $params); $this->assertEquals($organizationEntity['added'], 1); $paramsEntity = array('contact_id' => $ContactId); - $entity = civicrm_api('entity_tag', 'get', $paramsEntity); + $entity = $this->callAPISuccess('entity_tag', 'get', $paramsEntity); } ///////////////// civicrm_entity_tag_remove methods @@ -229,18 +195,17 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); $this->entityTagAdd($entityTagParams); $params = array( 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, - 'version' => $this->_apiversion, ); - $result = $this->callAPIFailure('entity_tag', 'delete', $params); - $this->assertEquals($result['error_message'], 'tag_id is a required field'); + $result = $this->callAPIFailure('entity_tag', 'delete', $params, + 'tag_id is a required field' + ); } function testEntityTagRemoveINDHH() { @@ -248,7 +213,6 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); $this->entityTagAdd($entityTagParams); @@ -256,12 +220,10 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $result = civicrm_api('entity_tag', 'delete', $params); + $result = $this->callAPISuccess('entity_tag', 'delete', $params); - $this->assertAPISuccess($result); $this->assertEquals($result['removed'], 2); } @@ -270,18 +232,15 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); $this->entityTagAdd($entityTagParams); $params = array( 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $result = civicrm_api('entity_tag', 'delete', $params); - $this->documentMe($params, $result, __FUNCTION__, __FILE__); + $result = $this->callAPIAndDocument('entity_tag', 'delete', $params, __FUNCTION__, __FILE__); $this->assertEquals($result['removed'], 1); } @@ -290,7 +249,6 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); $this->entityTagAdd($entityTagParams); @@ -298,123 +256,31 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_h' => $this->_householdID, 'contact_id_o' => $this->_organizationID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $result = civicrm_api('entity_tag', 'delete', $params); + $result = $this->callAPISuccess('entity_tag', 'delete', $params); $this->assertEquals($result['removed'], 1); $this->assertEquals($result['not_removed'], 1); } - ///////////////// civicrm_entity_tag_display methods - function testEntityTagDisplayWithContactId() { - $entityTagParams = array( - 'contact_id' => $this->_individualID, - 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, - ); - $this->entityTagAdd($entityTagParams); - - $params = array( - 'contact_id' => $this->_individualID, - 'version' => $this->_apiversion, - ); - - $result = civicrm_api3_entity_tag_display($params); - $this->assertEquals($this->_tag['values'][$this->_tag['id']]['name'], $result); - } - ///////////////// civicrm_tag_entities_get methods - - - ///////////////// civicrm_entity_tag_common methods - function testCommonAddEmptyParams() { - $params = array( - 'version' => $this->_apiversion, - ); - $individualEntity = _civicrm_api3_entity_tag_common($params, 'add'); - $this->assertEquals($individualEntity['is_error'], 1); - $this->assertEquals($individualEntity['error_message'], 'contact_id is a required field'); - } - - function testCommonAddWithoutTagID() { - $params = array( - 'contact_id' => $this->_individualID, - 'version' => $this->_apiversion, - ); - $individualEntity = _civicrm_api3_entity_tag_common($params, 'add'); - $this->assertEquals($individualEntity['is_error'], 1); - $this->assertEquals($individualEntity['error_message'], 'tag_id is a required field'); - } - - function testCommonAddWithoutContactID() { - $params = array( - 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, - ); - $individualEntity = _civicrm_api3_entity_tag_common($params, 'add'); - $this->assertEquals($individualEntity['is_error'], 1); - $this->assertEquals($individualEntity['error_message'], 'contact_id is a required field'); - } - function testCommonContactEntityTagAdd() { $params = array( 'contact_id' => $this->_individualID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $individualEntity = _civicrm_api3_entity_tag_common($params, 'add'); - $this->assertEquals($individualEntity['is_error'], 0); + $individualEntity = $this->callAPISuccess('entity_tag', 'create', $params); $this->assertEquals($individualEntity['added'], 1); } - function testEntityTagCommonRemoveNoContactId() { - $entityTagParams = array( - 'contact_id_i' => $this->_individualID, - 'contact_id_h' => $this->_householdID, - 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, - ); - $this->entityTagAdd($entityTagParams); - - $params = array( - 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, - ); - - $result = _civicrm_api3_entity_tag_common($params, 'remove'); - $this->assertAPIFailure($result); - $this->assertEquals($result['error_message'], 'contact_id is a required field'); - } - - function testEntityTagCommonRemoveNoTagId() { - $entityTagParams = array( - 'contact_id_i' => $this->_individualID, - 'contact_id_h' => $this->_householdID, - 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, - ); - $this->entityTagAdd($entityTagParams); - - $params = array( - 'contact_id_i' => $this->_individualID, - 'contact_id_h' => $this->_householdID, - 'version' => $this->_apiversion, - ); - - $result = _civicrm_api3_entity_tag_common($params, 'remove'); - $this->assertAPIFailure($result); - $this->assertEquals($result['error_message'], 'tag_id is a required field'); - } function testEntityTagCommonRemoveINDHH() { $entityTagParams = array( 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); $this->entityTagAdd($entityTagParams); @@ -422,12 +288,9 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $result = _civicrm_api3_entity_tag_common($params, 'remove'); - - $this->assertAPISuccess($result); + $result = $this->callAPISuccess('entity_tag', 'delete', $params); $this->assertEquals($result['removed'], 2); } @@ -436,17 +299,15 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); $this->entityTagAdd($entityTagParams); $params = array( 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $result = _civicrm_api3_entity_tag_common($params, 'remove'); + $result = $this->callAPISuccess('entity_tag', 'delete', $params); $this->assertEquals($result['removed'], 1); } @@ -455,7 +316,6 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_i' => $this->_individualID, 'contact_id_h' => $this->_householdID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); $this->entityTagAdd($entityTagParams); @@ -463,10 +323,9 @@ class api_v3_EntityTagTest extends CiviUnitTestCase { 'contact_id_h' => $this->_householdID, 'contact_id_o' => $this->_organizationID, 'tag_id' => $this->_tagID, - 'version' => $this->_apiversion, ); - $result = _civicrm_api3_entity_tag_common($params, 'remove'); + $result = $this->callAPISuccess('entity_tag', 'delete', $params); $this->assertEquals($result['removed'], 1); $this->assertEquals($result['not_removed'], 1); } -- 2.25.1