From b167943967e1b98c1aa78973f515c2dc92bdb3ee Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 26 May 2016 19:26:51 +1200 Subject: [PATCH] Make the changes John suggested last time, so the tests don't break EVERY time ... --- tests/phpunit/CRM/Dedupe/MergerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/CRM/Dedupe/MergerTest.php b/tests/phpunit/CRM/Dedupe/MergerTest.php index 4a5ecc0d2a..1faee3cb2f 100644 --- a/tests/phpunit/CRM/Dedupe/MergerTest.php +++ b/tests/phpunit/CRM/Dedupe/MergerTest.php @@ -163,7 +163,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase { // Retrieve pairs from prev next cache table $select = array('pn.is_selected' => 'is_selected'); - $cacheKeyString = "merge Individual_{$dao->id}_{$this->_groupId}_0"; + $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($dao->id, $this->_groupId); $pnDupePairs = CRM_Core_BAO_PrevNextCache::retrieve($cacheKeyString, NULL, NULL, 0, 0, $select); $this->assertEquals(count($foundDupes), count($pnDupePairs), 'Check number of dupe pairs in prev next cache.'); @@ -226,7 +226,7 @@ class CRM_Dedupe_MergerTest extends CiviUnitTestCase { // Retrieve pairs from prev next cache table $select = array('pn.is_selected' => 'is_selected'); - $cacheKeyString = "merge Individual_{$dao->id}_{$this->_groupId}_0"; + $cacheKeyString = CRM_Dedupe_Merger::getMergeCacheKeyString($dao->id, $this->_groupId); $pnDupePairs = CRM_Core_BAO_PrevNextCache::retrieve($cacheKeyString, NULL, NULL, 0, 0, $select); $this->assertEquals(count($foundDupes), count($pnDupePairs), 'Check number of dupe pairs in prev next cache.'); -- 2.25.1