Merge pull request #18822 from totten/master-prevnexttest

(NFC) dev/core#2029 - Make assertions in PrevNextTest more skimmable
civicrm · Oct 21, 2020 · 54cded9 · 54cded9
2 parents 4c291d5 + 3e9cd8a
commit 54cded9
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/tests/phpunit/E2E/Core/PrevNextTest.php b/tests/phpunit/E2E/Core/PrevNextTest.php
@@ -92,11 +92,10 @@ public function testFillArray() {
     $this->assertEquals(4, $this->prevNext->getCount($this->cacheKey));
     $this->assertEquals(0, $this->prevNext->getCount('not-a-key-' . $this->cacheKey));
 
-    $all = $this->prevNext->getSelection($this->cacheKey, 'getall')[$this->cacheKey];
-    $this->assertEquals([100, 400, 200, 300], array_keys($all));
+    $all = $this->assertSelections([100, 400, 200, 300], 'getall', $this->cacheKey);
     $this->assertEquals([1], array_unique(array_values($all)));
 
-    $this->assertSelections([]);
+    $this->assertSelections([], 'get', $this->cacheKey);
   }
 
   public function testFetch() {
@@ -250,20 +249,15 @@ public function testDeleteByCacheKey() {
     // Add some data that we're actually working with.
     $this->testFillArray();
 
-    $all = $this->prevNext->getSelection($this->cacheKey, 'getall')[$this->cacheKey];
-    $this->assertEquals([100, 400, 200, 300], array_keys($all), 'selected cache not correct for ' . $this->cacheKey
-      . ' defined keys are ' . $this->cacheKey . 'and ' . $this->cacheKeyB
-      . ' the prevNext cache is ' . print_r($this->prevNext, TRUE)
-    );
+    $all = $this->assertSelections([100, 400, 200, 300], 'getall', $this->cacheKey);
 
     list ($id1, $id2, $id3) = array_keys($all);
     $this->prevNext->markSelection($this->cacheKey, 'select', [$id1, $id3]);
-    $this->assertSelections([$id1, $id3]);
+    $this->assertSelections([$id1, $id3], 'get', $this->cacheKey);
 
     $this->prevNext->deleteItem(NULL, $this->cacheKey);
-    $all = $this->prevNext->getSelection($this->cacheKey, 'getall')[$this->cacheKey];
-    $this->assertEquals([], array_keys($all));
-    $this->assertSelections([]);
+    $this->assertSelections([], 'getall', $this->cacheKey);
+    $this->assertSelections([], 'get', $this->cacheKey);
 
     // Ensure background data was untouched.
     $this->assertSelections([100], 'get', $this->cacheKeyB);
@@ -329,6 +323,8 @@ public function testDeleteAll() {
    *   Contact IDs that should be selected.
    * @param string $action
    * @param string|NULL $cacheKey
+   * @return array
+   *   Contact IDs that were returned by getSelection($cacheKey, $action)
    */
   protected function assertSelections($ids, $action = 'get', $cacheKey = NULL) {
     if ($cacheKey === NULL) {
@@ -342,6 +338,7 @@ protected function assertSelections($ids, $action = 'get', $cacheKey = NULL) {
     );
 
     $this->assertCount(count($ids), $selected);
+    return $selected;
   }
 
 }