From 7f8c98cde39d1b23ba6257df9d7b06855abd5e11 Mon Sep 17 00:00:00 2001 From: Eileen Date: Thu, 12 Sep 2013 00:40:11 +0000 Subject: [PATCH] Update utils test to reflect changed funciton signature --- tests/phpunit/api/v3/UtilsTest.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/api/v3/UtilsTest.php b/tests/phpunit/api/v3/UtilsTest.php index 6b4a6ab045..8cbd5fa448 100644 --- a/tests/phpunit/api/v3/UtilsTest.php +++ b/tests/phpunit/api/v3/UtilsTest.php @@ -206,14 +206,16 @@ class api_v3_UtilsTest extends CiviUnitTestCase { function test_civicrm_api3_validate_fields() { $params = array('start_date' => '2010-12-20', 'end_date' => ''); - _civicrm_api3_validate_fields('relationship', 'get', $params); + $fields = civicrm_api3('relationship', 'getfields', array('action' => 'get')); + _civicrm_api3_validate_fields('relationship', 'get', $params, $fields['values']); $this->assertEquals('20101220000000', $params['start_date']); $this->assertEquals('', $params['end_date']); } function test_civicrm_api3_validate_fields_membership() { $params = array('start_date' => '2010-12-20', 'end_date' => '', 'membership_end_date' => '0', 'join_date' => '2010-12-20', 'membership_start_date' => '2010-12-20'); - _civicrm_api3_validate_fields('Membership', 'get', $params); + $fields = civicrm_api3('Membership', 'getfields', array('action' => 'get')); + _civicrm_api3_validate_fields('Membership', 'get', $params, $fields['values']); $this->assertEquals('20101220000000', $params['start_date'], 'in line ' . __LINE__); $this->assertEquals('', $params['end_date']); $this->assertEquals('20101220000000', $params['join_date'], 'join_date not set in line ' . __LINE__); @@ -225,7 +227,8 @@ class api_v3_UtilsTest extends CiviUnitTestCase { 'registration_start_date' => 20080601, 'registration_end_date' => '2008-10-15', 'start_date' => '2010-12-20', 'end_date' => '', ); - _civicrm_api3_validate_fields('event', 'create', $params); + $fields = civicrm_api3('Event', 'getfields', array('action' => 'create')); + _civicrm_api3_validate_fields('event', 'create', $params, $fields['values']); $this->assertEquals('20101220000000', $params['start_date'], 'in line ' . __LINE__); $this->assertEquals('20081015000000', $params['registration_end_date'], 'in line ' . __LINE__); $this->assertEquals('', $params['end_date'], 'in line ' . __LINE__); @@ -237,7 +240,8 @@ class api_v3_UtilsTest extends CiviUnitTestCase { 'join_date' => 'abc', ); try { - _civicrm_api3_validate_fields('Membership', 'get', $params); + $fields = civicrm_api3('Membership', 'getfields', array('action' => 'get')); + _civicrm_api3_validate_fields('Membership', 'get', $params, $fields['values']); } catch(Exception$expected) { $this->assertEquals('join_date is not a valid date: abc', $expected->getMessage()); -- 2.25.1