Update Unit tests to use Civi facade

diff --git a/tests/phpunit/CRM/Core/BAO/CacheTest.php b/tests/phpunit/CRM/Core/BAO/CacheTest.php
index 537556c0e041390207d4844e6f4a752f6dadaf0a..23326e9f8ee3be08e079fe66b2eb026ff2d5784e 100644 (file)
--- a/tests/phpunit/CRM/Core/BAO/CacheTest.php
+++ b/tests/phpunit/CRM/Core/BAO/CacheTest.php
@@ -31,6 +31,20 @@
  */
 class CRM_Core_BAO_CacheTest extends CiviUnitTestCase {
 
+  /**
+   * @var CRM_Utils_Cache_Interface
+   */
+  protected $a;
+
+  public function createSimpleCache() {
+    return new CRM_Utils_Cache_FastArrayDecorator(
+      $this->a = CRM_Utils_Cache::create([
+        'name' => 'CRM_Core_BAO_CacheTest',
+        'type' => ['*memory*', 'SqlGroup', 'ArrayCache'],
+      ])
+    );
+  }
+
   public function testMultiVersionDecode() {
     $encoders = ['serialize', ['CRM_Core_BAO_Cache', 'encode']];
     $values = [NULL, 0, 1, TRUE, FALSE, [], ['abcd'], 'ab;cd', new stdClass()];
@@ -68,9 +82,10 @@ class CRM_Core_BAO_CacheTest extends CiviUnitTestCase {
    * @dataProvider exampleValues
    */
   public function testSetGetItem($originalValue) {
-    CRM_Core_BAO_Cache::setItem($originalValue, __CLASS__, 'testSetGetItem');
+    $this->createSimpleCache();
+    $this->a->set('testSetGetItem', $originalValue);
 
-    $return_1 = CRM_Core_BAO_Cache::getItem(__CLASS__, 'testSetGetItem');
+    $return_1 = $this->a->get('testSetGetItem');
     $this->assertEquals($originalValue, $return_1);
 
     // Wipe out any in-memory copies of the cache. Check to see if the SQL
@@ -78,7 +93,8 @@ class CRM_Core_BAO_CacheTest extends CiviUnitTestCase {
 
     CRM_Core_BAO_Cache::$_cache = NULL;
     CRM_Utils_Cache::$_singleton = NULL;
-    $return_2 = CRM_Core_BAO_Cache::getItem(__CLASS__, 'testSetGetItem');
+    $this->a->values = [];
+    $return_2 = $this->a->get('testSetGetItem');
     $this->assertEquals($originalValue, $return_2);
   }
 

diff --git a/tests/phpunit/api/v3/SystemTest.php b/tests/phpunit/api/v3/SystemTest.php
index 9bccdbe8abecdca87d341a6fb242dfc57e2275e3..91a12ce2fcdc04cc2136abdfe8c84d68caa8a056 100644 (file)
--- a/tests/phpunit/api/v3/SystemTest.php
+++ b/tests/phpunit/api/v3/SystemTest.php
@@ -54,17 +54,17 @@ class api_v3_SystemTest extends CiviUnitTestCase {
     // check all of them -- just enough to make sure that the API is doing
     // something
 
-    $this->assertTrue(NULL === CRM_Core_BAO_Cache::getItem(self::TEST_CACHE_GROUP, self::TEST_CACHE_PATH));
+    $this->assertTrue(NULL === Civi::cache()->get(CRM_Utils_Cache::cleanKey(self::TEST_CACHE_PATH)));
 
     $data = 'abc';
-    CRM_Core_BAO_Cache::setItem($data, self::TEST_CACHE_GROUP, self::TEST_CACHE_PATH);
+    Civi::cache()->set(CRM_Utils_Cache::cleanKey(self::TEST_CACHE_PATH), $data);
 
-    $this->assertEquals('abc', CRM_Core_BAO_Cache::getItem(self::TEST_CACHE_GROUP, self::TEST_CACHE_PATH));
+    $this->assertEquals('abc', Civi::cache()->get(CRM_Utils_Cache::cleanKey(self::TEST_CACHE_PATH)));
 
     $params = array();
     $result = $this->callAPIAndDocument('system', 'flush', $params, __FUNCTION__, __FILE__, "Flush all system caches", 'Flush');
 
-    $this->assertTrue(NULL === CRM_Core_BAO_Cache::getItem(self::TEST_CACHE_GROUP, self::TEST_CACHE_PATH));
+    $this->assertTrue(NULL === Civi::cache()->get(CRM_Utils_Cache::cleanKey(self::TEST_CACHE_PATH)));
   }
 
   /**