Merge pull request #15884 from kainuk/issue-lab-1365

[civicrm-core.git] / tests / phpunit / CRM / Utils / DeprecatedUtilsTest.php

diff --git a/tests/phpunit/CRM/Utils/DeprecatedUtilsTest.php b/tests/phpunit/CRM/Utils/DeprecatedUtilsTest.php
index 9c7277504c360aa2896c7b3c3ac5f1998cf26745..2cb51c4195224b1d36a2d8593762a4641ff4873a 100644 (file)
--- a/tests/phpunit/CRM/Utils/DeprecatedUtilsTest.php
+++ b/tests/phpunit/CRM/Utils/DeprecatedUtilsTest.php
@@ -14,12 +14,12 @@ class CRM_Utils_DeprecatedUtilsTest extends CiviUnitTestCase {
 
   public function tearDown() {
     // truncate a few tables
-    $tablesToTruncate = array(
+    $tablesToTruncate = [
       'civicrm_contact',
       'civicrm_email',
       'civicrm_contribution',
       'civicrm_website',
-    );
+    ];
 
     $this->quickCleanup($tablesToTruncate);
   }
@@ -28,7 +28,7 @@ class CRM_Utils_DeprecatedUtilsTest extends CiviUnitTestCase {
    *  Test civicrm_contact_check_params with no contact type.
    */
   public function testCheckParamsWithNoContactType() {
-    $params = array('foo' => 'bar');
+    $params = ['foo' => 'bar'];
     $contact = _civicrm_api3_deprecated_contact_check_params($params, FALSE);
     $this->assertEquals(1, $contact['is_error']);
   }
@@ -38,28 +38,17 @@ class CRM_Utils_DeprecatedUtilsTest extends CiviUnitTestCase {
    *  and request the error in array format
    */
   public function testCheckParamsWithDuplicateContact2() {
-    //  Insert a row in civicrm_contact creating individual contact
-    $op = new PHPUnit_Extensions_Database_Operation_Insert();
-    $op->execute($this->_dbconn,
-      $this->createXMLDataSet(
-        dirname(__FILE__) . '/../../api/v3/dataset/contact_17.xml'
-      )
-    );
-    $op->execute($this->_dbconn,
-      $this->createXMLDataSet(
-        dirname(__FILE__) . '/../../api/v3/dataset/email_contact_17.xml'
-      )
-    );
+    $this->individualCreate(['first_name' => 'Test', 'last_name' => 'Contact', 'email' => 'TestContact@example.com']);
 
-    $params = array(
+    $params = [
       'first_name' => 'Test',
       'last_name' => 'Contact',
       'email' => 'TestContact@example.com',
       'contact_type' => 'Individual',
-    );
+    ];
     $contact = _civicrm_api3_deprecated_contact_check_params($params, TRUE);
     $this->assertEquals(1, $contact['is_error']);
-    $this->assertRegexp("/matching contacts.*17/s",
+    $this->assertRegexp("/matching contacts.*1/s",
       $contact['error_message']['message']
     );
   }
@@ -69,7 +58,7 @@ class CRM_Utils_DeprecatedUtilsTest extends CiviUnitTestCase {
    *  params and no params
    */
   public function testCheckParamsWithNoParams() {
-    $params = array();
+    $params = [];
     $contact = _civicrm_api3_deprecated_contact_check_params($params, FALSE);
     $this->assertEquals(1, $contact['is_error']);
   }