[FSSDK-12398] adjustment

Author: junaed-optimizely

OptimizelySDK.Tests/ProjectConfigTest.cs

@@ -1490,11 +1490,9 @@ public void TestCmabFieldPopulation()
 
             Assert.IsNull(experimentWithoutCmab.Cmab);
         }
-    }
 
-    [TestFixture]
-    public class FeatureRolloutProjectConfigTest
-    {
+        #region Feature Rollout Tests
+
         private string BuildFeatureRolloutDatafile(
             string experimentType = "fr",
             string rolloutId = "rollout_1",
@@ -1640,8 +1638,8 @@ private string BuildFeatureRolloutDatafile(
         public void TestBackwardCompatibilityExperimentsWithoutTypeField()
         {
             var datafile = BuildFeatureRolloutDatafile();
-            var config = DatafileProjectConfig.Create(datafile, new NoOpLogger(),
-                new NoOpErrorHandler());
+            var config = DatafileProjectConfig.Create(datafile, LoggerMock.Object,
+                ErrorHandlerMock.Object);
 
             var abExperiment = config.GetExperimentFromKey("ab_experiment");
             Assert.IsNull(abExperiment.Type);
@@ -1651,8 +1649,8 @@ public void TestBackwardCompatibilityExperimentsWithoutTypeField()
         public void TestFeatureRolloutInjectionAddsEveryoneElseVariation()
         {
             var datafile = BuildFeatureRolloutDatafile();
-            var config = DatafileProjectConfig.Create(datafile, new NoOpLogger(),
-                new NoOpErrorHandler());
+            var config = DatafileProjectConfig.Create(datafile, LoggerMock.Object,
+                ErrorHandlerMock.Object);
 
             var rolloutExperiment = config.GetExperimentFromKey("rollout_experiment");
 
@@ -1672,8 +1670,8 @@ public void TestFeatureRolloutInjectionAddsEveryoneElseVariation()
         public void TestVariationMapsUpdatedWithInjectedVariation()
         {
             var datafile = BuildFeatureRolloutDatafile();
-            var config = DatafileProjectConfig.Create(datafile, new NoOpLogger(),
-                new NoOpErrorHandler());
+            var config = DatafileProjectConfig.Create(datafile, LoggerMock.Object,
+                ErrorHandlerMock.Object);
 
             var rolloutExperiment = config.GetExperimentFromKey("rollout_experiment");
 
@@ -1702,8 +1700,8 @@ public void TestVariationMapsUpdatedWithInjectedVariation()
         public void TestNonRolloutExperimentsNotModified()
         {
             var datafile = BuildFeatureRolloutDatafile();
-            var config = DatafileProjectConfig.Create(datafile, new NoOpLogger(),
-                new NoOpErrorHandler());
+            var config = DatafileProjectConfig.Create(datafile, LoggerMock.Object,
+                ErrorHandlerMock.Object);
 
             var abExperiment = config.GetExperimentFromKey("ab_experiment");
 
@@ -1717,8 +1715,8 @@ public void TestNonRolloutExperimentsNotModified()
         public void TestNoRolloutEdgeCaseSilentSkip()
         {
             var datafile = BuildFeatureRolloutDatafile(rolloutId: "");
-            var config = DatafileProjectConfig.Create(datafile, new NoOpLogger(),
-                new NoOpErrorHandler());
+            var config = DatafileProjectConfig.Create(datafile, LoggerMock.Object,
+                ErrorHandlerMock.Object);
 
             var rolloutExperiment = config.GetExperimentFromKey("rollout_experiment");
 
@@ -1731,11 +1729,13 @@ public void TestNoRolloutEdgeCaseSilentSkip()
         public void TestTypeFieldParsedCorrectly()
         {
             var datafile = BuildFeatureRolloutDatafile();
-            var config = DatafileProjectConfig.Create(datafile, new NoOpLogger(),
-                new NoOpErrorHandler());
+            var config = DatafileProjectConfig.Create(datafile, LoggerMock.Object,
+                ErrorHandlerMock.Object);
 
             var rolloutExperiment = config.GetExperimentFromKey("rollout_experiment");
             Assert.AreEqual("fr", rolloutExperiment.Type);
         }
+
+        #endregion
     }
 }

OptimizelySDK/Config/DatafileProjectConfig.cs

@@ -377,11 +377,11 @@ private void Initialize()
 
             var validExperimentTypes = new HashSet<string>
             {
-                Experiment.ExperimentTypeAb,
-                Experiment.ExperimentTypeMab,
-                Experiment.ExperimentTypeCmab,
-                Experiment.ExperimentTypeTd,
-                Experiment.ExperimentTypeFr,
+                Experiment.EXPERIMENT_TYPE_AB,
+                Experiment.EXPERIMENT_TYPE_MAB,
+                Experiment.EXPERIMENT_TYPE_CMAB,
+                Experiment.EXPERIMENT_TYPE_TD,
+                Experiment.EXPERIMENT_TYPE_FR,
             };
 
             foreach (var experiment in _ExperimentIdMap.Values)
@@ -480,7 +480,7 @@ private void Initialize()
                     }
 
                     var experiment = _ExperimentIdMap[experimentId];
-                    if (experiment.Type != Experiment.ExperimentTypeFr)
+                    if (experiment.Type != Experiment.EXPERIMENT_TYPE_FR)
                     {
                         continue;
                     }

OptimizelySDK/Entity/Experiment.cs

@@ -23,11 +23,11 @@ public class Experiment : ExperimentCore
     {
         private const string MUTEX_GROUP_POLICY = "random";
 
-        public const string ExperimentTypeAb = "ab";
-        public const string ExperimentTypeMab = "mab";
-        public const string ExperimentTypeCmab = "cmab";
-        public const string ExperimentTypeTd = "td";
-        public const string ExperimentTypeFr = "fr";
+        public const string EXPERIMENT_TYPE_AB = "ab";
+        public const string EXPERIMENT_TYPE_MAB = "mab";
+        public const string EXPERIMENT_TYPE_CMAB = "cmab";
+        public const string EXPERIMENT_TYPE_TD = "td";
+        public const string EXPERIMENT_TYPE_FR = "fr";
 
         /// <summary>
         /// Group ID for the experiment