feat(dfm): Integrate DFM with optimizely

OptimizelySDK.Net40/OptimizelySDK.Net40.csproj

@@ -234,6 +234,9 @@
 	<Compile Include="..\OptimizelySDK\Config\FallbackProjectConfigManager.cs">
 	  <Link>Config\FallbackProjectConfigManager.cs</Link>
 	</Compile>
+	<Compile Include="..\OptimizelySDK\OptimizelyFactory.cs">
+	  <Link>OptimizelyFactory.cs</Link>
+	</Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\OptimizelySDK\Utils\schema.json">

OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj

@@ -76,6 +76,9 @@
 		<Compile Include="..\OptimizelySDK\Config\FallbackProjectConfigManager.cs">
 		  <Link>AtomicProjectConfigManager.cs</Link>
 		</Compile>
+		<Compile Include="..\OptimizelySDK\OptimizelyFactory.cs">
+		  <Link>OptimizelyFactory.cs</Link>
+		</Compile>
     </ItemGroup>
     <ItemGroup>
         <EmbeddedResource Include="..\OptimizelySDK\Utils\schema.json">

OptimizelySDK.Tests/DatafileManagement Tests/AtomicProjectConfigManagerTest.cs → OptimizelySDK.Tests/ConfigTest/FallbackProjectConfigManagerTest.cs

@@ -22,13 +22,14 @@ namespace OptimizelySDK.Tests.DatafileManagement_Tests
     [TestFixture]
     public class AtomicProjectConfigManagerTest
     {
-        private FallbackProjectConfigManager ConfigManager = new FallbackProjectConfigManager();
+        private FallbackProjectConfigManager ConfigManager;
 
         [Test]
         public void TestStaticProjectConfigManagerReturnsCorrectProjectConfig()
         {
             var expectedConfig = DatafileProjectConfig.Create(TestData.TypedAudienceDatafile, null, null);
-            ConfigManager.SetConfig(expectedConfig);
+            ConfigManager = new FallbackProjectConfigManager(expectedConfig);
+
             Assert.True(TestData.CompareObjects(expectedConfig, ConfigManager.GetConfig()));
         }
     }

OptimizelySDK.Tests/EntityTests/FeatureVariableTest.cs

@@ -0,0 +1,19 @@
+using System;
+using NUnit.Framework;
+using OptimizelySDK.Entity;
+
+namespace OptimizelySDK.Tests.EntityTests
+{
+    [TestFixture]
+    public class FeatureVariableTest
+    {
+        [Test]
+        public void TestFeatureVariableTypeName()
+        {
+            Assert.AreEqual(FeatureVariable.GetFeatureVariableTypeName(FeatureVariable.VariableType.BOOLEAN), "GetFeatureVariableBoolean");
+            Assert.AreEqual(FeatureVariable.GetFeatureVariableTypeName(FeatureVariable.VariableType.DOUBLE), "GetFeatureVariableDouble");
+            Assert.AreEqual(FeatureVariable.GetFeatureVariableTypeName(FeatureVariable.VariableType.INTEGER), "GetFeatureVariableInteger");
+            Assert.AreEqual(FeatureVariable.GetFeatureVariableTypeName(FeatureVariable.VariableType.STRING), "GetFeatureVariableString");
+        }
+    }
+}

OptimizelySDK.Tests/OptimizelySDK.Tests.csproj

@@ -72,9 +72,9 @@
   <ItemGroup>
     <Compile Include="AudienceConditionsTests\ConditionEvaluationTest.cs" />
     <Compile Include="AudienceConditionsTests\ConditionsTest.cs" />
-    <Compile Include="DatafileManagement Tests\HttpProjectConfigManagerTest.cs" />
-    <Compile Include="DatafileManagement Tests\PollingProjectConfigManagerTest.cs" />
-    <Compile Include="DatafileManagement Tests\AtomicProjectConfigManagerTest.cs" />
+    <Compile Include="ConfigTest\HttpProjectConfigManagerTest.cs" />
+    <Compile Include="ConfigTest\PollingProjectConfigManagerTest.cs" />
+    <Compile Include="ConfigTest\FallbackProjectConfigManagerTest.cs" />
     <Compile Include="DecisionServiceTest.cs" />
     <Compile Include="DefaultErrorHandlerTest.cs" />
     <Compile Include="EventTests\DefaultEventDispatcherTest.cs" />
@@ -95,7 +95,8 @@
     <Compile Include="UtilsTests\PrivateObject.cs" />
     <Compile Include="UtilsTests\ValidatorTest.cs" />
     <Compile Include="ValidEventDispatcher.cs" />
-    <Compile Include="DatafileManagement Tests\TestPollingProjectConfigManager.cs" />
+    <Compile Include="ConfigTest\TestPollingProjectConfigManager.cs" />
+    <Compile Include="EntityTests\FeatureVariableTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.config" />

OptimizelySDK.Tests/ProjectConfigTest.cs

@@ -669,41 +669,41 @@ public void TestSetGetForcedVariation()
             var optlyObject = new Optimizely(TestData.Datafile, new ValidEventDispatcher(), LoggerMock.Object);
             optlyObject.Activate("test_experiment", "test_user", userAttributes);
 
-            // invalid experiment key should return a null variation
+            // invalid experiment key should return a null variation	
             Assert.False(Config.SetForcedVariation(invalidExperimentKey, userId, expectedVariationKey));
             Assert.Null(Config.GetForcedVariation(invalidExperimentKey, userId));
 
-            // setting a null variation should return a null variation
+            // setting a null variation should return a null variation	
             Assert.True(Config.SetForcedVariation(experimentKey, userId, null));
             Assert.Null(Config.GetForcedVariation(experimentKey, userId));
 
-            // setting an invalid variation should return a null variation
+            // setting an invalid variation should return a null variation	
             Assert.False(Config.SetForcedVariation(experimentKey, userId, invalidVariationKey));
             Assert.Null(Config.GetForcedVariation(experimentKey, userId));
 
-            // confirm the forced variation is returned after a set
+            // confirm the forced variation is returned after a set	
             Assert.True(Config.SetForcedVariation(experimentKey, userId, expectedVariationKey));
             var actualForcedVariation = Config.GetForcedVariation(experimentKey, userId);
             Assert.AreEqual(expectedVariationKey, actualForcedVariation.Key);
 
-            // check multiple sets
+            // check multiple sets	
             Assert.True(Config.SetForcedVariation(experimentKey2, userId, expectedVariationKey2));
             var actualForcedVariation2 = Config.GetForcedVariation(experimentKey2, userId);
             Assert.AreEqual(expectedVariationKey2, actualForcedVariation2.Key);
-            // make sure the second set does not overwrite the first set
+            // make sure the second set does not overwrite the first set	
             actualForcedVariation = Config.GetForcedVariation(experimentKey, userId);
             Assert.AreEqual(expectedVariationKey, actualForcedVariation.Key);
-            // make sure unsetting the second experiment-to-variation mapping does not unset the
-            // first experiment-to-variation mapping
+            // make sure unsetting the second experiment-to-variation mapping does not unset the	
+            // first experiment-to-variation mapping	
             Assert.True(Config.SetForcedVariation(experimentKey2, userId, null));
             actualForcedVariation = Config.GetForcedVariation(experimentKey, userId);
             Assert.AreEqual(expectedVariationKey, actualForcedVariation.Key);
 
-            // an invalid user ID should return a null variation
+            // an invalid user ID should return a null variation	
             Assert.Null(Config.GetForcedVariation(experimentKey, invalidUserId));
         }
 
-        // test that all the logs in setForcedVariation are getting called
+        // test that all the logs in setForcedVariation are getting called	
         [Test]
         public void TestSetForcedVariationLogs()
         {
@@ -714,7 +714,7 @@ public void TestSetForcedVariationLogs()
             var variationKey = "control";
             var variationId = "7722370027";
             var invalidVariationKey = "invalid_variation";
-            
+
             Config.SetForcedVariation(invalidExperimentKey, userId, variationKey);
             Config.SetForcedVariation(experimentKey, userId, null);
             Config.SetForcedVariation(experimentKey, userId, invalidVariationKey);
@@ -727,7 +727,7 @@ public void TestSetForcedVariationLogs()
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, string.Format(@"Set variation ""{0}"" for experiment ""{1}"" and user ""{2}"" in the forced variation map.", variationId, experimentId, userId)));
         }
 
-        // test that all the logs in getForcedVariation are getting called
+        // test that all the logs in getForcedVariation are getting called	
         [Test]
         public void TestGetForcedVariationLogs()
         {
@@ -753,30 +753,30 @@ public void TestGetForcedVariationLogs()
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, string.Format(@"No experiment ""{0}"" mapped to user ""{1}"" in the forced variation map.", pausedExperimentKey, userId)));
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, string.Format(@"Variation ""{0}"" is mapped to experiment ""{1}"" and user ""{2}"" in the forced variation map", variationKey, experimentKey, userId)));
         }
-        
+
         [Test]
         public void TestSetForcedVariationMultipleSets()
         {
             Assert.True(Config.SetForcedVariation("test_experiment", "test_user_1", "variation"));
             Assert.AreEqual(Config.GetForcedVariation("test_experiment", "test_user_1").Key, "variation");
-            
-            // same user, same experiment, different variation
+
+            // same user, same experiment, different variation	
             Assert.True(Config.SetForcedVariation("test_experiment", "test_user_1", "control"));
             Assert.AreEqual(Config.GetForcedVariation("test_experiment", "test_user_1").Key, "control");
-            
-            // same user, different experiment
+
+            // same user, different experiment	
             Assert.True(Config.SetForcedVariation("group_experiment_1", "test_user_1", "group_exp_1_var_1"));
             Assert.AreEqual(Config.GetForcedVariation("group_experiment_1", "test_user_1").Key, "group_exp_1_var_1");
 
-            // different user
+            // different user	
             Assert.True(Config.SetForcedVariation("test_experiment", "test_user_2", "variation"));
             Assert.AreEqual(Config.GetForcedVariation("test_experiment", "test_user_2").Key, "variation");
-            
-            // different user, different experiment
+
+            // different user, different experiment	
             Assert.True(Config.SetForcedVariation("group_experiment_1", "test_user_2", "group_exp_1_var_1"));
             Assert.AreEqual(Config.GetForcedVariation("group_experiment_1", "test_user_2").Key, "group_exp_1_var_1");
 
-            // make sure the first user forced variations are still valid
+            // make sure the first user forced variations are still valid	
             Assert.AreEqual(Config.GetForcedVariation("test_experiment", "test_user_1").Key, "control");
             Assert.AreEqual(Config.GetForcedVariation("group_experiment_1", "test_user_1").Key, "group_exp_1_var_1");
         }