From 7cbfc70645df77a9f5aa3c3702b7f5257d47a09d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 6 Jun 2019 21:27:52 +1200
Subject: [PATCH] Test tweaks that *might* help with intermittant test
 weirdness

It's technically possible for the 2 cache keys to be the same - which would break stuff - although it seems
a bit too frequent to be the reason...

Also we clear one cache in tear down & not the other.

I'm not optimistic either of these will solve the intermittant fails but they seem more correct changed

Also I added verbosity
---
 tests/phpunit/E2E/Core/PrevNextTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/E2E/Core/PrevNextTest.php b/tests/phpunit/E2E/Core/PrevNextTest.php
index 97e020865e..64784fe9dd 100644
--- a/tests/phpunit/E2E/Core/PrevNextTest.php
+++ b/tests/phpunit/E2E/Core/PrevNextTest.php
@@ -31,7 +31,7 @@ class PrevNextTest extends \CiviEndToEndTestCase {
     parent::setUp();
     $this->prevNext = \Civi::service('prevnext');
     $this->cacheKey = 'PrevNextTest_' . \CRM_Utils_String::createRandom(16, \CRM_Utils_String::ALPHANUMERIC);
-    $this->cacheKeyB = 'PrevNextTest_' . \CRM_Utils_String::createRandom(16, \CRM_Utils_String::ALPHANUMERIC);
+    $this->cacheKeyB = 'PrevNextTestb_' . \CRM_Utils_String::createRandom(16, \CRM_Utils_String::ALPHANUMERIC);
     $this->assertTrue(
       \CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_contact') > 25,
       'The contact table must have at least 25 records.'
@@ -40,6 +40,7 @@ class PrevNextTest extends \CiviEndToEndTestCase {
 
   protected function tearDown() {
     \Civi::service('prevnext')->deleteItem(NULL, $this->cacheKey);
+    \Civi::service('prevnext')->deleteItem(NULL, $this->cacheKeyB);
   }
 
   public function testFillSql() {
@@ -331,7 +332,7 @@ class PrevNextTest extends \CiviEndToEndTestCase {
       $cacheKey = $this->cacheKey;
     }
     $selected = $this->prevNext->getSelection($cacheKey, $action)[$cacheKey];
-    $this->assertEquals($ids, array_keys($selected));
+    $this->assertEquals($ids, array_keys($selected), 'selected cache not correct for ' . $cacheKey . 'defined keys are ' . $this->cacheKey . 'and ' . $this->cacheKeyB);
     $this->assertCount(count($ids), $selected);
   }
 
-- 
2.25.1