From 405f289b8af8caf8ecc5d15dab92d8ccc069770a Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 6 Sep 2013 08:59:56 +1200 Subject: [PATCH] minor test fixes --- tests/phpunit/CiviTest/CiviUnitTestCase.php | 8 +++----- tests/phpunit/api/v3/ContactTest.php | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index d4f1645dd2..108edd3773 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -888,13 +888,11 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase { * * @return int id of Household created */ - function householdCreate($params = NULL) { - if ($params === NULL) { - $params = array( + function householdCreate($params = array()) { + $params = array_merge(array( 'household_name' => 'Unit Test household', 'contact_type' => 'Household', - ); - } + ), $params); return $this->_contactCreate($params); } diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php index a982e88411..5f4b7b6a50 100644 --- a/tests/phpunit/api/v3/ContactTest.php +++ b/tests/phpunit/api/v3/ContactTest.php @@ -87,6 +87,7 @@ class api_v3_ContactTest extends CiviUnitTestCase { 'civicrm_website', 'civicrm_relationship', 'civicrm_uf_match', + 'civicrm_phone', ); $this->quickCleanup($tablesToTruncate, TRUE); -- 2.25.1