resetting context for integration tests

Author: mmelograno

src/SplitIO/Component/Common/Context.php

@@ -2,6 +2,7 @@
 namespace SplitIO\Component\Common;
 
 use SplitIO\Component\Log\Logger;
+use SplitIO\Exception\Exception;
 
 /**
  * Class Context
@@ -77,10 +78,10 @@ public function __wakeup()
     public static function trackFactory($apiKey)
     {
         $current = self::getInstance()->factoryTracker[$apiKey] ?? 0;
-        if ($current == 0) {
-            self::getInstance()->getLogger()->warning(self::MULTIPLE_INSTANCES);
-        } else {
+        if ($current > 0) {
             self::getInstance()->getLogger()->warning(sprintf(self::SAME_APIKEY, $current));
+        } elseif (count(self::getInstance()->factoryTracker) > 0) {
+            self::getInstance()->getLogger()->warning(self::MULTIPLE_INSTANCES);
         }
         $current += 1;
         self::getInstance()->factoryTracker[$apiKey] = $current;

src/SplitIO/Sdk.php

@@ -31,12 +31,12 @@ public static function factory($apiKey = 'localhost', array $options = array())
         //Adding API Key into args array.
         $options['apiKey'] = $apiKey;
 
-        //Tracking Factory Instantiation
-        Context::trackFactory($apiKey);
-
         //Register Logger
         self::registerLogger((isset($options['log'])) ? $options['log'] : array());
 
+        //Tracking Factory Instantiation
+        Context::trackFactory($apiKey);
+
         if ($apiKey == 'localhost') {
             return new LocalhostSplitFactory($options);
         } else {

tests/Suite/Redis/ReflectiveTools.php

@@ -82,4 +82,14 @@ public static function overrideTracker()
         $property->setAccessible(true);
         $property->setValue($di, array());
     }
+
+    public static function resetContext()
+    {
+        $context = Context::getInstance();
+        $reflection = new \ReflectionClass($context);
+        $instance = $reflection->getProperty('instance');
+        $instance->setAccessible(true);
+        $instance->setValue(null, null);
+        $instance->setAccessible(false);
+    }
 }

tests/Suite/Sdk/SdkClientTest.php

@@ -2,6 +2,7 @@
 namespace SplitIO\Test\Suite\Sdk;
 
 use \stdClass;
+use ReflectionClass;
 use SplitIO\Test\Suite\Redis\ReflectiveTools;
 use SplitIO\Component\Cache\ImpressionCache;
 use SplitIO\Component\Cache\EventsCache;
@@ -19,6 +20,7 @@ class SdkClientTest extends \PHPUnit\Framework\TestCase
 {
     public function testLocalClient()
     {
+        ReflectiveTools::resetContext();
         $options['splitFile'] = dirname(dirname(__DIR__)).'/files/.splits';
         $splitFactory = \SplitIO\Sdk::factory('localhost', $options);
         $splitSdk = $splitFactory->client();
@@ -35,6 +37,7 @@ public function testLocalClient()
 
     public function testLocalClientYAML()
     {
+        ReflectiveTools::resetContext();
         $options['splitFile'] = dirname(dirname(__DIR__)).'/files/splits.yml';
         $splitFactory = \SplitIO\Sdk::factory('localhost', $options);
         $splitSdk = $splitFactory->client();
@@ -207,6 +210,7 @@ private function validateLastImpression(
 
     public function testClient()
     {
+        ReflectiveTools::resetContext();
         //Testing version string
         $this->assertTrue(is_string(\SplitIO\version()));
 
@@ -437,6 +441,7 @@ public function testClient()
      */
     public function testCustomLog()
     {
+        ReflectiveTools::resetContext();
         // create a log channel
         $log = $this
             ->getMockBuilder('Psr\Log\LoggerInterface')
@@ -472,6 +477,7 @@ public function testCustomLog()
 
     public function testInvalidCacheAdapter()
     {
+        ReflectiveTools::resetContext();
         $this->expectException('\SplitIO\Exception\Exception');
 
         $sdkConfig = array(
@@ -485,6 +491,7 @@ public function testInvalidCacheAdapter()
 
     public function testCacheExceptionReturnsControl()
     {
+        ReflectiveTools::resetContext();
         $log = $this
             ->getMockBuilder('Psr\Log\LoggerInterface')
             ->disableOriginalConstructor()
@@ -523,6 +530,7 @@ public function testCacheExceptionReturnsControl()
 
     public function testGetTreatmentsWithDistinctFeatures()
     {
+        ReflectiveTools::resetContext();
         //Testing version string
         $this->assertTrue(is_string(\SplitIO\version()));
 
@@ -559,13 +567,13 @@ public function testGetTreatmentsWithDistinctFeatures()
 
     public function testGetTreatmentsWithRepeteadedFeatures()
     {
+        ReflectiveTools::resetContext();
         //Testing version string
         $this->assertTrue(is_string(\SplitIO\version()));
 
         $parameters = array('scheme' => 'redis', 'host' => REDIS_HOST, 'port' => REDIS_PORT, 'timeout' => 881);
         $options = array('prefix' => TEST_PREFIX);
 
-        ReflectiveTools::resetIPAddress();
         $sdkConfig = array(
             'log' => array('adapter' => 'stdout'),
             'cache' => array('adapter' => 'predis', 'parameters' => $parameters, 'options' => $options),
@@ -597,13 +605,13 @@ public function testGetTreatmentsWithRepeteadedFeatures()
 
     public function testGetTreatmentsWithRepeteadedAndNullFeatures()
     {
+        ReflectiveTools::resetIPAddress();
         //Testing version string
         $this->assertTrue(is_string(\SplitIO\version()));
 
         $parameters = array('scheme' => 'redis', 'host' => REDIS_HOST, 'port' => REDIS_PORT, 'timeout' => 881);
         $options = array('prefix' => TEST_PREFIX);
 
-        ReflectiveTools::resetIPAddress();
         $sdkConfig = array(
             'log' => array('adapter' => 'stdout'),
             'cache' => array('adapter' => 'predis', 'parameters' => $parameters, 'options' => $options),
@@ -635,6 +643,7 @@ public function testGetTreatmentsWithRepeteadedAndNullFeatures()
 
     public function testGetTreatmentsFetchesSplitsInOneCall()
     {
+        ReflectiveTools::resetIPAddress();
         // Set redis-library client mock
         $predisMock = $this
             ->getMockBuilder('\Predis\Client')
@@ -682,13 +691,13 @@ public function testGetTreatmentsFetchesSplitsInOneCall()
 
     public function testMultipleInstantiationNotOverrideIP()
     {
+        ReflectiveTools::resetIPAddress();
         //Testing version string
         $this->assertTrue(is_string(\SplitIO\version()));
 
         $parameters = array('scheme' => 'redis', 'host' => REDIS_HOST, 'port' => REDIS_PORT, 'timeout' => 881);
         $options = array('prefix' => TEST_PREFIX);
 
-        ReflectiveTools::resetIPAddress();
         $sdkConfig = array(
             'log' => array('adapter' => 'stdout'),
             'cache' => array('adapter' => 'predis', 'parameters' => $parameters, 'options' => $options),