Merge pull request #22 from optimizely/aliabbasrizvi/improve_test_coverage

More unit tests

Author: aliabbasrizvi

tests/OptimizelyTest.php

@@ -275,6 +275,40 @@ public function testActivateInvalidAttributes()
         $this->assertNull($optlyObject->activate('test_experiment', 'test_user', 42));
     }
 
+    public function testActivateUserInNoVariation()
+    {
+        $userAttributes = [
+            'device_type' => 'iPhone',
+            'company' => 'Optimizely',
+            'location' => 'San Francisco'
+        ];
+
+        $this->eventBuilderMock->expects($this->never())
+            ->method('createImpressionEvent');
+
+        $this->loggerMock->expects($this->exactly(3))
+            ->method('log');
+        $this->loggerMock->expects($this->at(0))
+            ->method('log')
+            ->with(Logger::DEBUG, 'Assigned bucket 8495 to user "not_in_variation_user".');
+        $this->loggerMock->expects($this->at(1))
+            ->method('log')
+            ->with(Logger::INFO,
+                'User "not_in_variation_user" is in no variation.');
+        $this->loggerMock->expects($this->at(2))
+            ->method('log')
+            ->with(Logger::INFO, 'Not activating user "not_in_variation_user".');
+
+        $optlyObject = new Optimizely($this->datafile, new ValidEventDispatcher(), $this->loggerMock);
+
+        $eventBuilder = new \ReflectionProperty(Optimizely::class, '_eventBuilder');
+        $eventBuilder->setAccessible(true);
+        $eventBuilder->setValue($optlyObject, $this->eventBuilderMock);
+
+        // Call activate
+        $this->assertNull($optlyObject->activate('test_experiment', 'not_in_variation_user', $userAttributes));
+    }
+
     public function testActivateNoAudienceNoAttributes()
     {
         $this->eventBuilderMock->expects($this->once())

tests/UtilsTests/ConditionEvaluatorTest.php

@@ -29,7 +29,7 @@ class ConditionEvaluatorTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $decoder = new ConditionDecoder();
-        $conditions = "[\"and\", [\"or\", [\"or\", {\"name\": \"device_type\", \"type\": \"custom_attribute\", \"value\": \"iPhone\"}]], [\"or\", [\"or\", {\"name\": \"location\", \"type\": \"custom_attribute\", \"value\": \"San Francisco\"}]]]";
+        $conditions = "[\"and\", [\"or\", [\"or\", {\"name\": \"device_type\", \"type\": \"custom_attribute\", \"value\": \"iPhone\"}]], [\"or\", [\"or\", {\"name\": \"location\", \"type\": \"custom_attribute\", \"value\": \"San Francisco\"}]], [\"or\", [\"not\", [\"or\", {\"name\": \"browser\", \"type\": \"custom_attribute\", \"value\": \"Firefox\"}]]]]";
         $decoder->deserializeAudienceConditions($conditions);
 
         $this->conditionsList = $decoder->getConditionsList();
@@ -41,7 +41,7 @@ public function testEvaluateConditionsMatch()
         $userAttributes = [
             'device_type' => 'iPhone',
             'location' => 'San Francisco',
-            'browser' => 'chrome'
+            'browser' => 'Chrome'
         ];
 
         $this->assertTrue($this->conditionEvaluator->evaluate($this->conditionsList, $userAttributes));
@@ -51,8 +51,9 @@ public function testEvaluateConditionsMatch()
     public function testEvaluateConditionsDoNotMatch()
     {
         $userAttributes = [
+            'device_type' => 'iPhone',
             'location' => 'San Francisco',
-            'browser' => 'chrome'
+            'browser' => 'Firefox'
         ];
 
         $this->assertFalse($this->conditionEvaluator->evaluate($this->conditionsList, $userAttributes));