updated tests with changes in redisWrapper

Matias Melograno · Matias Melograno · commit bd52908bd53c · 2022-03-17T10:09:30.000-03:00
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,47 +12,54 @@
         <testsuite name="splitio">
             <directory suffix="Test.php">tests/</directory>
         </testsuite>
-        <testsuite name="redis-adapter">
-            <file>tests/Suite/Redis/CacheInterfacesTest.php</file>
+        <testsuite name="adapter">
+            <directory suffix="Test.php">tests/Suite/Adapter</directory>
+        </testsuite>
+        <testsuite name="attributes">
+            <directory suffix="Test.php">tests/Suite/Attributes/</directory>
         </testsuite>
         <testsuite name="common">
             <directory suffix="Test.php">tests/Suite/Common/</directory>
         </testsuite>
         <testsuite name="component">
             <directory suffix="Test.php">tests/Suite/Component/</directory>
+        </testsuite>
+                <testsuite name="dynamic_configurations">
+            <directory suffix="Test.php">tests/Suite/DynamicConfigurations/</directory>
         </testsuite>
         <testsuite name="engine">
             <directory suffix="Test.php">tests/Suite/Engine/</directory>
         </testsuite>
+        <testsuite name="input_validation">
+            <directory suffix="Test.php">tests/Suite/InputValidation/</directory>
+        </testsuite>
         <testsuite name="matchers">
             <directory suffix="Test.php">tests/Suite/Matchers/</directory>
         </testsuite>
         <testsuite name="metrics">
             <directory suffix="Test.php">tests/Suite/Metrics/</directory>
         </testsuite>
+        <testsuite name="redis">
+            <directory suffix="Test.php">tests/Suite/Redis/</directory>
+        </testsuite>
         <testsuite name="sdk">
             <directory suffix="Test.php">tests/Suite/Sdk/</directory>
         </testsuite>
-        <testsuite name="attributes">
-            <directory suffix="Test.php">tests/Suite/Attributes/</directory>
-        </testsuite>
-        <testsuite name="input_validation">
-            <directory suffix="Test.php">tests/Suite/InputValidation/</directory>
-        </testsuite>
 
 
 
         <testsuite name="integration">
+            <directory suffix="Test.php">tests/Suite/Adapter/</directory>
+            <directory suffix="Test.php">tests/Suite/Attributes/</directory>
             <directory suffix="Test.php">tests/Suite/Common/</directory>
             <directory suffix="Test.php">tests/Suite/Component/</directory>
+            <directory suffix="Test.php">tests/Suite/DynamicConfigurations/</directory>
             <directory suffix="Test.php">tests/Suite/Engine/</directory>
+            <directory suffix="Test.php">tests/Suite/InputValidation/</directory>
             <directory suffix="Test.php">tests/Suite/Matchers/</directory>
             <directory suffix="Test.php">tests/Suite/Metrics/</directory>
+            <directory suffix="Test.php">tests/Suite/Redis/</directory>
             <directory suffix="Test.php">tests/Suite/Sdk/</directory>
-            <directory suffix="Test.php">tests/Suite/Adapter/</directory>
-            <directory suffix="Test.php">tests/Suite/Attributes/</directory>
-            <directory suffix="Test.php">tests/Suite/InputValidation/</directory>
-            <directory suffix="Test.php">tests/Suite/DynamicConfigurations/</directory>
         </testsuite>
     </testsuites>
 
diff --git a/src/SplitIO/Component/Cache/Storage/Adapter/PRedis.php b/src/SplitIO/Component/Cache/Storage/Adapter/PRedis.php
@@ -239,8 +239,11 @@ public function getItem($key)
      */
     public function getItems(array $keys = array())
     {
-        $values = $this->client->mget($keys);
         $toReturn = array();
+        if (count($keys) == 0) {
+            return $toReturn;
+        }
+        $values = $this->client->mget($keys);
         foreach ($keys as $index => $key) {
             $toReturn[$key] = new Item($key);
             if (!is_null($values[$index])) {
diff --git a/src/SplitIO/Component/Cache/Storage/Adapter/SafeRedisWrapper.php b/src/SplitIO/Component/Cache/Storage/Adapter/SafeRedisWrapper.php
@@ -53,7 +53,7 @@ public function getItems(array $keys = array())
         try {
             return $this->cacheAdapter->getItems($keys);
         } catch (\Exception $e) {
-            Di::getLogger()->critical("An error occurred getting " . $keys . " from redis.");
+            Di::getLogger()->critical("An error occurred getting " . json_encode($keys) . " from redis.");
             Di::getLogger()->critical($e->getMessage());
             Di::getLogger()->critical($e->getTraceAsString());
             return array();
diff --git a/src/SplitIO/Component/Initialization/CacheTrait.php b/src/SplitIO/Component/Initialization/CacheTrait.php
@@ -8,45 +8,21 @@ class CacheTrait
 {
     public static function addCache($adapter, array $options)
     {
-        switch ($adapter) {
-            case 'filesystem':
-                $adapter_config = array(
-                    'name' => 'filesystem',
-                    'options' => array(
-                        'path'=> isset($options['filesystem-path']) ? $options['filesystem-path'] : null
-                    )
-                );
-                break;
-            case 'predis':
-                $adapter_config = array(
-                    'name' => 'predis',
-                    'options' => array(
-                        'options'               => isset($options['predis-options'])
-                            ? $options['predis-options'] : null,
-                        'parameters'            => isset($options['predis-parameters'])
-                            ? $options['predis-parameters'] : null,
-                        'sentinels'             => isset($options['predis-sentinels'])
-                            ? $options['predis-sentinels'] : null,
-                        'clusterNodes'          => isset($options['predis-clusterNodes'])
-                            ? $options['predis-clusterNodes'] : null,
-                        'distributedStrategy'   => isset($options['predis-distributedStrategy'])
-                            ? $options['predis-distributedStrategy'] : null,
-                    )
-                );
-                break;
-            case 'redis':
-            default:
-                $adapter_config = array(
-                    'name' => 'redis',
-                    'options' => array(
-                        'host'      => isset($options['redis-host']) ? $options['redis-host'] : null,
-                        'port'      => isset($options['redis-port']) ? $options['redis-port'] : null,
-                        'password'  => isset($options['redis-pass']) ? $options['redis-pass'] : null,
-                        'timeout'   => isset($options['redis-timeout']) ? $options['redis-timeout'] : null,
-                    )
-                );
-                break;
-        }
+        $adapter_config = array(
+            'name' => 'predis',
+            'options' => array(
+                'options'               => isset($options['predis-options'])
+                    ? $options['predis-options'] : null,
+                'parameters'            => isset($options['predis-parameters'])
+                    ? $options['predis-parameters'] : null,
+                'sentinels'             => isset($options['predis-sentinels'])
+                    ? $options['predis-sentinels'] : null,
+                'clusterNodes'          => isset($options['predis-clusterNodes'])
+                    ? $options['predis-clusterNodes'] : null,
+                'distributedStrategy'   => isset($options['predis-distributedStrategy'])
+                    ? $options['predis-distributedStrategy'] : null,
+            )
+        );
 
         ServiceProvider::registerCache(new Pool(array('adapter' => $adapter_config)));
     }
diff --git a/src/SplitIO/Sdk/Factory/SplitFactory.php b/src/SplitIO/Sdk/Factory/SplitFactory.php
@@ -46,14 +46,17 @@ public function __construct($apiKey, array $options = array())
 
     private function doBUR()
     {
-        $ready =  (isset($this->options['ready']) && $this->options['ready'] > 0) ? $this->options['ready'] : null;
+        /*
+            Deprecated
+            $ready =  (isset($this->options['ready']) && $this->options['ready'] > 0) ? $this->options['ready'] : null;
 
-        //Block Until Ready
-        if ($ready) {
-            if (!$this->blockUntilReady($ready)) {
-                throw new TimeOutException("Cache data is not ready yet");
+            //Block Until Ready
+            if ($ready) {
+                if (!$this->blockUntilReady($ready)) {
+                    throw new TimeOutException("Cache data is not ready yet");
+                }
             }
-        }
+        */
     }
 
     /**
diff --git a/tests/Suite/Redis/CacheInterfacesTest.php b/tests/Suite/Redis/CacheInterfacesTest.php
@@ -10,6 +10,11 @@
 use SplitIO\Component\Log\Handler\Stdout;
 use SplitIO\Component\Log\Logger;
 use SplitIO\Component\Log\LogLevelEnum;
+use SplitIO\Sdk\Events\EventDTO;
+use SplitIO\Sdk\Events\EventQueueMessage;
+use SplitIO\Sdk\QueueMetadataMessage;
+
+use SplitIO\Test\Utils;
 
 class CacheInterfacesTest extends \PHPUnit\Framework\TestCase
 {
@@ -31,18 +36,21 @@ public function testDiLog()
     public function testDiCache()
     {
         try {
-            $cachePoolAdapter = array(
-                'name' => 'redis',
-                'options' => array(
-                    'host' => REDIS_HOST,
-                    'port' => REDIS_PORT,
-                )
+            $parameters = array(
+                'host' => REDIS_HOST,
+                'port' => REDIS_PORT,
             );
 
-            $cachePool = new Pool(array( 'adapter' => $cachePoolAdapter ));
+            $cachePool = new Pool(array('adapter' => array(
+                'name' => 'predis',
+                'options' => array(
+                    'options' => array('prefix' => TEST_PREFIX),
+                    'parameters' => $parameters,
+                ),
+            )));
             Di::getInstance()->setCache($cachePool);
         } catch (\Exception $e) {
-            $this->assertTrue(false, "Error setting cache on Di");
+            $this->assertTrue(false, "Error setting cache on Di".  $e);
         }
 
         $this->assertTrue(true);
@@ -57,6 +65,7 @@ public function testSplitCacheInterface()
         $splitChanges = file_get_contents(__DIR__."/../../files/splitChanges.json");
         $this->assertJson($splitChanges);
 
+        Utils\Utils::addSplitsInCache($splitChanges);
         $splitCache = new SplitCache();
 
         $splitChanges = json_decode($splitChanges, true);
@@ -65,14 +74,7 @@ public function testSplitCacheInterface()
 
         $splitName = $split['name'];
 
-        $this->assertTrue($splitCache->addSplit($splitName, json_encode($split)));
-
         $this->assertEquals(strlen(json_encode($split)), strlen($splitCache->getSplit($splitName)));
-
-        $this->assertTrue($splitCache->removeSplit($splitName));
-
-        $this->assertTrue($splitCache->setChangeNumber($splitChanges['till']));
-
         $this->assertEquals($splitChanges['till'], $splitCache->getChangeNumber());
     }
 
@@ -82,48 +84,19 @@ public function testSplitCacheInterface()
     public function testSegmentCacheInterface()
     {
         $segmentChanges = file_get_contents(__DIR__."/../../files/segmentEmployeesChanges.json");
-
         $this->assertJson($segmentChanges);
 
-        $segmentData = json_decode($segmentChanges, true);
+        Utils\Utils::addSegmentsInCache($segmentChanges);
 
+        $segmentData = json_decode($segmentChanges, true);
         $segmentName = $segmentData['name'];
-
         $segmentCache = new SegmentCache();
-
-        $this->assertArrayHasKey('fake_user_id_4', $segmentCache->addToSegment($segmentName, $segmentData['added']));
-
-        $removedResult = $segmentCache->removeFromSegment($segmentName, $segmentData['removed']);
-        $this->assertArrayHasKey('fake_user_id_6', $removedResult);
-
-        $this->assertTrue($segmentCache->setChangeNumber($segmentName, $segmentData['till']));
+        $this->assertTrue(boolval($segmentCache->isInSegment($segmentName, "fake_user_id_4")));
+        $this->assertFalse(boolval($segmentCache->isInSegment($segmentName, "fake_user_id_4_")));
 
         $this->assertEquals($segmentData['till'], $segmentCache->getChangeNumber($segmentName));
     }
 
-    /**
-     * @depends testDiLog
-     * @depends testDiCache
-     */
-    public function testBlockUntilReadyCacheInterface()
-    {
-        $dateTimeUTC = new \DateTime("now", new \DateTimeZone("UTC"));
-        $deltaTime = 100;
-
-        $splitsTimestamp = $dateTimeUTC->getTimestamp();
-        $segmentsTimestamp = $dateTimeUTC->getTimestamp() + $deltaTime;
-
-        $bur = new BlockUntilReadyCache();
-        $bur->setReadySplits($splitsTimestamp);
-        $bur->setReadySegments($segmentsTimestamp);
-
-        //Checking
-        $this->assertEquals($splitsTimestamp, $bur->getReadySplits());
-        $this->assertEquals($segmentsTimestamp, $bur->getReadySegments());
-
-        $this->assertEquals(min($splitsTimestamp, $segmentsTimestamp), $bur->getReadyCheckpoint());
-    }
-
     /**
      * @depends testDiLog
      * @depends testDiCache
@@ -135,9 +108,8 @@ public function testEventsCache()
         $eventType = "some_event_type";
         $value = 0.0;
 
-        $eventDTO = new EventDTO($key, $trafficType, $eventType, $value);
-        $eventMessageMetadata = new EventQueueMetadataMessage();
-        $eventQueueMessage = new EventQueueMessage($eventMessageMetadata, $eventDTO);
+        $eventDTO = new EventDTO($key, $trafficType, $eventType, $value, null);
+        $eventQueueMessage = new EventQueueMessage(new QueueMetadataMessage(), $eventDTO);
 
         $this->assertTrue(EventsCache::addEvent($eventQueueMessage));
     }
@@ -160,8 +132,7 @@ public function testEventsCacheWithProperties()
         );
 
         $eventDTO = new EventDTO($key, $trafficType, $eventType, $value, $properties);
-        $eventMessageMetadata = new EventQueueMetadataMessage();
-        $eventQueueMessage = new EventQueueMessage($eventMessageMetadata, $eventDTO);
+        $eventQueueMessage = new EventQueueMessage(new QueueMetadataMessage(), $eventDTO);
 
         $this->assertTrue(EventsCache::addEvent($eventQueueMessage));
 
diff --git a/tests/Suite/Redis/PRedisReadOnlyMock.php b/tests/Suite/Redis/PRedisReadOnlyMock.php
@@ -14,7 +14,7 @@ public function __construct(PRedis $predis)
     }
 
 
- /**
+    /**
      * @param string $key
      * @return \SplitIO\Component\Cache\Item
      */
diff --git a/tests/Suite/Redis/SafeRedisWrapperTest.php b/tests/Suite/Redis/SafeRedisWrapperTest.php
@@ -0,0 +1,74 @@
+<?php
+namespace SplitIO\Test\Suite\Redis;
+
+use ReflectionClass;
+
+
+use SplitIO\Component\Cache\Storage\Adapter\SafeRedisWrapper;
+use SplitIO\Component\Cache\Storage\Adapter\PRedis;
+
+class SafeRedisWrapperTest extends \PHPUnit\Framework\TestCase
+{
+    public function testAllMethodsException()
+    {
+        // Set redis-library client mock
+        $cachePoolMethods = array('get', 'mget', 'rpush', 'keys', 'sismember', 'expire', 'getOptions');
+        $predisMock = $this
+            ->getMockBuilder('\Predis\Client')
+            ->disableOriginalConstructor()
+            ->setMethods($cachePoolMethods)
+            ->getMock();
+
+        foreach ($cachePoolMethods as $method) {
+            $predisMock->method($method)
+                ->will($this->throwException(new \Exception()));
+        }
+
+        $predisMock->method('getOptions')
+                ->willReturn(array());
+
+        /*
+        $reflectionPRedis = new ReflectionClass('SplitIO\Component\Cache\Storage\Adapter\PRedis');
+        $parameters = array(
+            'host' => REDIS_HOST,
+            'port' => REDIS_PORT,
+        );
+        $predisAdapter = new PRedis(array(
+            'parameters' => array(
+                'scheme' => 'tcp',
+                'host' => 'localhost',
+                'port' => 6379,
+                'timeout' => 881,
+                'database' => 0
+            )
+        ));
+        $property = $reflectionPRedis->getProperty('client');
+        $property->setAccessible(true);
+        $property->setValue($predisMock, $predisMock);
+
+        // $predisAdapter->client = predisMock;
+
+        $safeRedisWrapper = new SafeRedisWrapper($reflectionPRedis);
+        */
+
+        $predisAdapter = new PRedis(array(
+            'parameters' => array(
+                'scheme' => 'tcp',
+                'host' => 'localhost',
+                'port' => 6379,
+            )
+        ));
+        $refObject = new \ReflectionObject($predisAdapter);
+        $refProperty = $refObject->getProperty('client');
+        $refProperty->setAccessible(true);
+        $refProperty->setValue($predisAdapter, $predisMock);
+        $safeRedisWrapper = new SafeRedisWrapper($predisAdapter);
+
+        $this->assertEquals(false, $safeRedisWrapper->getItem("some")->get());
+        $this->assertEquals(array(), $safeRedisWrapper->getItems(array("some")));
+        $this->assertEquals(false, $safeRedisWrapper->isOnList("some", "another"));
+        $this->assertEquals(array(), $safeRedisWrapper->getKeys("some"));
+        $this->assertEquals(0, $safeRedisWrapper->rightPushQueue("some", "another"));
+        $this->assertEquals(false, $safeRedisWrapper->expireKey("some", 12345));
+    }
+}
diff --git a/tests/Utils/Utils.php b/tests/Utils/Utils.php

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public function __construct(PRedis $predis)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`
`17`		`- /**`
	`17`	`+ /**`
`18`	`18`	`* @param string $key`
`19`	`19`	`* @return \SplitIO\Component\Cache\Item`
`20`	`20`	`*/`