Towards CRM-20155 remove duplicate calls to dedupe functions.

[civicrm-core.git] / tests / phpunit / CRM / Dedupe / DedupeFinderTest.php

diff --git a/tests/phpunit/CRM/Dedupe/DedupeFinderTest.php b/tests/phpunit/CRM/Dedupe/DedupeFinderTest.php
index b624c1ad5e454dc2877a6edbc0f1e20e9136feb8..417fb63f79065d5021f198f44519e7b0ed212cd5 100644 (file)
--- a/tests/phpunit/CRM/Dedupe/DedupeFinderTest.php
+++ b/tests/phpunit/CRM/Dedupe/DedupeFinderTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'CiviTest/Contact.php';
-
 /**
  * Class CRM_Dedupe_DedupeFinderTest
  * @group headless
@@ -26,10 +24,9 @@ class CRM_Dedupe_DedupeFinderTest extends CiviUnitTestCase {
       'domain_id' => 1,
       'is_active' => 1,
       'visibility' => 'Public Pages',
-      'version' => 3,
     );
-    // TODO: This is not an API test!!
-    $result = civicrm_api('group', 'create', $params);
+
+    $result = $this->callAPISuccess('group', 'create', $params);
     $groupId = $result['id'];
 
     // contact data set
@@ -80,18 +77,15 @@ class CRM_Dedupe_DedupeFinderTest extends CiviUnitTestCase {
     );
 
     $count = 1;
-    // TODO: This is not an API test!!
     foreach ($params as $param) {
-      $param['version'] = 3;
-      $contact = civicrm_api('contact', 'create', $param);
+      $contact = $this->callAPISuccess('contact', 'create', $param);
       $contactIds[$count++] = $contact['id'];
 
       $grpParams = array(
         'contact_id' => $contact['id'],
         'group_id' => $groupId,
-        'version' => 3,
       );
-      $res = civicrm_api('group_contact', 'create', $grpParams);
+      $this->callAPISuccess('group_contact', 'create', $grpParams);
     }
 
     // verify that all contacts have been created separately
@@ -113,9 +107,8 @@ class CRM_Dedupe_DedupeFinderTest extends CiviUnitTestCase {
     // so 1 pair for - first + last + mail
     $this->assertEquals(count($foundDupes), 1, 'Check Individual-Fuzzy dupe rule for dupesInGroup().');
 
-    // delete all created contacts
     foreach ($contactIds as $contactId) {
-      Contact::delete($contactId);
+      $this->contactDelete($contactId);
     }
     // delete dupe group
     $params = array('id' => $groupId, 'version' => 3);
@@ -182,17 +175,15 @@ class CRM_Dedupe_DedupeFinderTest extends CiviUnitTestCase {
     );
 
     $count = 1;
-    // TODO: This is not an API test!!
+
     foreach ($params as $param) {
-      $param['version'] = 3;
-      $contact = civicrm_api('contact', 'create', $param);
+      $contact = $this->callAPISuccess('contact', 'create', $param);
       $params = array(
         'contact_id' => $contact['id'],
         'street_address' => 'Ambachtstraat 23',
         'location_type_id' => 1,
-        'version' => 3,
       );
-      $result = civicrm_api('address', 'create', $params);
+      $this->callAPISuccess('address', 'create', $params);
       $contactIds[$count++] = $contact['id'];
     }
 
@@ -211,16 +202,15 @@ class CRM_Dedupe_DedupeFinderTest extends CiviUnitTestCase {
       'email' => 'hood@example.com',
       'street_address' => 'Ambachtstraat 23',
     );
-    $errorScope = CRM_Core_TemporaryErrorScope::useException();
-    $dedupeParams = CRM_Dedupe_Finder::formatParams($fields, 'Individual');
-    $ids = CRM_Dedupe_Finder::dupesByParams($dedupeParams, 'Individual', 'General');
+    CRM_Core_TemporaryErrorScope::useException();
+    $ids = CRM_Contact_BAO_Contact::getDuplicateContacts($fields, 'Individual', 'General');
 
     // Check with default Individual-General rule
     $this->assertEquals(count($ids), 2, 'Check Individual-General rule for dupesByParams().');
 
     // delete all created contacts
     foreach ($contactIds as $contactId) {
-      Contact::delete($contactId);
+      $this->contactDelete($contactId);
     }
   }