From: eileen <eileen@fuzion.co.nz>
Date: Thu, 5 Sep 2013 20:59:56 +0000 (+1200)
Subject: minor test fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=405f289b8af8caf8ecc5d15dab92d8ccc069770a;p=civicrm-core.git

minor test fixes
---

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);