From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 13 Oct 2016 12:08:48 +0000 (+0100)
Subject: Remove duplicate test
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=de41258d7bd152ac1cafeca822a9246607bd7220;p=civicrm-core.git

Remove duplicate test

Dave pointed out this is a less complete copy of another test.
---

diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php
index 70f1df585f..a77b668e53 100644
--- a/tests/phpunit/api/v3/JobTest.php
+++ b/tests/phpunit/api/v3/JobTest.php
@@ -353,38 +353,6 @@ class api_v3_JobTest extends CiviUnitTestCase {
     }
   }
 
-  /**
-   * Test the batch merge function actually works!
-   *
-   * @dataProvider getMergeSets
-   *
-   * @param $dataSet
-   */
-  public function testBatchMergeConflictOnDeceased($dataSet) {
-    foreach ($dataSet['contacts'] as $params) {
-      $this->callAPISuccess('Contact', 'create', $params);
-    }
-
-    $result = $this->callAPISuccess('Job', 'process_batch_merge', array('mode' => $dataSet['mode']));
-    $this->assertEquals($dataSet['skipped'], count($result['values']['skipped']), 'Failed to skip the right number:' . $dataSet['skipped']);
-    $this->assertEquals($dataSet['merged'], count($result['values']['merged']));
-    $result = $this->callAPISuccess('Contact', 'get', array(
-      'contact_sub_type' => 'Student',
-      'sequential' => 1,
-      'options' => array('sort' => 'id ASC'),
-    ));
-    $this->assertEquals(count($dataSet['expected']), $result['count']);
-    foreach ($dataSet['expected'] as $index => $contact) {
-      foreach ($contact as $key => $value) {
-        // Handle the fact it's in a different field in the return value.
-        if ($key == 'gender_id') {
-          $key = 'gender';
-        }
-        $this->assertEquals($value, $result['values'][$index][$key]);
-      }
-    }
-  }
-
   /**
    * Check that the merge carries across various related entities.
    *