Patching tests

Author: aliabbasrizvi

optimizely/entities.py

@@ -70,8 +70,6 @@ def __init__(self, id, policy, experiments, trafficAllocation, **kwargs):
 
 class Variation(BaseEntity):
 
-  def __init__(self, id, key, variables=None, featureFlagMap=None, **kwargs):
+  def __init__(self, id, key, **kwargs):
     self.id = id
     self.key = key
-    self.variables = variables or []
-    self.featureFlagMap = featureFlagMap or {}

optimizely/optimizely.py

@@ -191,6 +191,8 @@ def activate(self, experiment_key, user_id, attributes=None):
       error = sys.exc_info()[1]
       self.logger.log(enums.LogLevels.ERROR, 'Unable to dispatch impression event. Error: %s' % str(error))
 
+    self.notification_center.send_notifications(enums.NotificationTypes.ACTIVATE,
+                                                experiment, user_id, attributes, variation, impression_event)
     return variation.key
 
   def track(self, event_key, user_id, attributes=None, event_tags=None):

tests/test_config.py

@@ -456,24 +456,12 @@ def test_init__with_v3_datafile(self):
     }
     expected_variation_key_map = {
       'test_experiment': {
-        'control': entities.Variation('111128', 'control', [{'id': '127', 'value': 'false'}], {'is_working': False}),
-        'variation': entities.Variation('111129', 'variation', [{'id': '127', 'value': 'true'}], {'is_working': True})
+        'control': entities.Variation('111128', 'control'),
+        'variation': entities.Variation('111129', 'variation')
       },
       'group_exp_1': {
-        'group_exp_1_control': entities.Variation(
-          '28901', 'group_exp_1_control', [
-            {'id': '128', 'value': 'prod'}, {'id': '129', 'value': '1772'}, {'id': '130', 'value': '1.22992'}], {
-            'environment': 'prod',
-            'number_of_days': 1772,
-            'significance_value': 1.22992
-          }),
-        'group_exp_1_variation': entities.Variation(
-          '28902', 'group_exp_1_variation', [
-            {'id': '128', 'value': 'stage'}, {'id': '129', 'value': '112'}, {'id': '130', 'value': '1.211'}], {
-            'environment': 'stage',
-            'number_of_days': 112,
-            'significance_value': 1.211
-          })
+        'group_exp_1_control': entities.Variation('28901', 'group_exp_1_control'),
+        'group_exp_1_variation': entities.Variation('28902', 'group_exp_1_variation')
       },
       'group_exp_2': {
         'group_exp_2_control': entities.Variation('28905', 'group_exp_2_control'),
@@ -482,22 +470,12 @@ def test_init__with_v3_datafile(self):
     }
     expected_variation_id_map = {
       'test_experiment': {
-        '111128': entities.Variation('111128', 'control', [{'id': '127', 'value': 'false'}], {'is_working': False}),
-        '111129': entities.Variation('111129', 'variation', [{'id': '127', 'value': 'true'}], {'is_working': True})
+        '111128': entities.Variation('111128', 'control'),
+        '111129': entities.Variation('111129', 'variation')
       },
       'group_exp_1': {
-        '28901': entities.Variation('28901', 'group_exp_1_control', [
-            {'id': '128', 'value': 'prod'}, {'id': '129', 'value': '1772'}, {'id': '130', 'value': '1.22992'}], {
-            'environment': 'prod',
-            'number_of_days': 1772,
-            'significance_value': 1.22992
-          }),
-        '28902': entities.Variation('28902', 'group_exp_1_variation', [
-            {'id': '128', 'value': 'stage'}, {'id': '129', 'value': '112'}, {'id': '130', 'value': '1.211'}], {
-            'environment': 'stage',
-            'number_of_days': 112,
-            'significance_value': 1.211
-          })
+        '28901': entities.Variation('28901', 'group_exp_1_control'),
+        '28902': entities.Variation('28902', 'group_exp_1_variation')
       },
       'group_exp_2': {
         '28905': entities.Variation('28905', 'group_exp_2_control'),
@@ -513,7 +491,6 @@ def test_init__with_v3_datafile(self):
     self.assertEqual(expected_audience_id_map, project_config.audience_id_map)
     self.assertEqual(expected_variation_key_map, project_config.variation_key_map)
     self.assertEqual(expected_variation_id_map, project_config.variation_id_map)
-    self.assertEqual(expected_feature_flag_id_map, project_config.feature_flag_id_map)
 
   def test_get_version(self):
     """ Test that JSON version is retrieved correctly when using get_version. """

tests/test_optimizely.py

@@ -21,7 +21,6 @@
 from optimizely import logger
 from optimizely import optimizely
 from optimizely import project_config
-from optimizely import user_profile
 from optimizely import version
 from optimizely.logger import SimpleLogger
 from optimizely.notification_center import NotificationCenter
@@ -429,72 +428,6 @@ def test_track_listener_with_attr_with_event_tags(self):
                                                  {'value': 1.234, 'non-revenue': 'abc'},
                                                  mock_dispatch.call_args[0][0])
 
-  def test_is_feature_enabled__callback_listener(self):
-    """ Test that the feature is enabled for the user if bucketed into variation of an experiment.
-    Also confirm that impression event is dispatched. """
-
-    opt_obj = optimizely.Optimizely(json.dumps(self.config_dict_with_features))
-    project_config = opt_obj.config
-    feature = project_config.get_feature_from_key('test_feature_in_experiment')
-
-    access_callback = [False]
-
-    def on_activate(experiment, user_id, attributes, variation, event):
-      access_callback[0] = True
-
-    opt_obj.notification_center.add_notification_listener(enums.NotificationTypes.ACTIVATE, on_activate)
-
-    mock_experiment = project_config.get_experiment_from_key('test_experiment')
-    mock_variation = project_config.get_variation_from_id('test_experiment', '111129')
-
-    with mock.patch('optimizely.decision_service.DecisionService.get_variation_for_feature',
-                    return_value=decision_service.Decision(
-                      mock_experiment,
-                      mock_variation,
-                      decision_service.DECISION_SOURCE_EXPERIMENT
-                    )) as mock_decision, \
-        mock.patch('optimizely.event_dispatcher.EventDispatcher.dispatch_event') as mock_dispatch_event, \
-        mock.patch('uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'), \
-        mock.patch('time.time', return_value=42):
-      self.assertTrue(opt_obj.is_feature_enabled('test_feature_in_experiment', 'test_user'))
-
-    mock_decision.assert_called_once_with(feature, 'test_user', None)
-    self.assertTrue(access_callback[0])
-
-  def test_is_feature_enabled_rollout_callback_listener(self):
-    """ Test that the feature is enabled for the user if bucketed into variation of a rollout.
-    Also confirm that no impression event is dispatched. """
-
-    opt_obj = optimizely.Optimizely(json.dumps(self.config_dict_with_features))
-    project_config = opt_obj.config
-    feature = project_config.get_feature_from_key('test_feature_in_experiment')
-
-    access_callback = [False]
-
-    def on_activate(experiment, user_id, attributes, variation, event):
-      access_callback[0] = True
-
-    opt_obj.notification_center.add_notification_listener(enums.NotificationTypes.ACTIVATE, on_activate)
-
-    mock_experiment = project_config.get_experiment_from_key('test_experiment')
-    mock_variation = project_config.get_variation_from_id('test_experiment', '111129')
-    with mock.patch('optimizely.decision_service.DecisionService.get_variation_for_feature',
-                    return_value=decision_service.Decision(
-                      mock_experiment,
-                      mock_variation,
-                      decision_service.DECISION_SOURCE_ROLLOUT
-                    )) as mock_decision, \
-        mock.patch('optimizely.event_dispatcher.EventDispatcher.dispatch_event') as mock_dispatch_event, \
-        mock.patch('uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'), \
-        mock.patch('time.time', return_value=42):
-      self.assertTrue(opt_obj.is_feature_enabled('test_feature_in_experiment', 'test_user'))
-
-    mock_decision.assert_called_once_with(feature, 'test_user', None)
-
-    # Check that impression event is not sent
-    self.assertEqual(0, mock_dispatch_event.call_count)
-    self.assertEqual(False, access_callback[0])
-
   def test_activate__with_attributes__audience_match(self):
     """ Test that activate calls dispatch_event with right params and returns expected
     variation when attributes are provided and audience conditions are met. """