diff --git a/OptimizelySDK.Tests/DecisionServiceTest.cs b/OptimizelySDK.Tests/DecisionServiceTest.cs index f746ac3f..fcf9fb22 100644 --- a/OptimizelySDK.Tests/DecisionServiceTest.cs +++ b/OptimizelySDK.Tests/DecisionServiceTest.cs @@ -951,7 +951,7 @@ public void TestGetVariationForFeatureWhenTheUserIsNeitherBucketedIntoFeatureExp OptimizelyUserContextMock.Setup(ouc => ouc.GetUserId()).Returns(UserProfileId); var actualDecision = DecisionServiceMock.Object.GetVariationForFeature(featureFlag, OptimizelyUserContextMock.Object, ProjectConfig); - Assert.IsNull(actualDecision.ResultObject); + Assert.IsNull(actualDecision.ResultObject.Variation); LoggerMock.Verify(l => l.Log(LogLevel.INFO, "The user \"userProfileId\" is not bucketed into a rollout for feature flag \"string_single_variable_feature\".")); } diff --git a/OptimizelySDK.Tests/OptimizelyUserContextTest.cs b/OptimizelySDK.Tests/OptimizelyUserContextTest.cs index d5ab832a..74572577 100644 --- a/OptimizelySDK.Tests/OptimizelyUserContextTest.cs +++ b/OptimizelySDK.Tests/OptimizelyUserContextTest.cs @@ -224,21 +224,6 @@ public void TestGetForcedDecisionReturnsNullIfInvalidConfig() Assert.IsNull(result); } - [Test] - public void TestSetForcedDecisionReturnsFalseForNullConfig() - { - var optly = new Optimizely(new FallbackProjectConfigManager(null), logger: LoggerMock.Object); - - var user = optly.CreateUserContext(UserID); - - var context = new OptimizelyDecisionContext("flag", null); - var decision = new OptimizelyForcedDecision("variationKey"); - var result = user.SetForcedDecision(context, decision); - - Assert.IsFalse(result); - LoggerMock.Verify(log => log.Log(LogLevel.ERROR, "Optimizely SDK not configured properly yet."), Times.Once); - } - [Test] public void TestGetForcedDecisionReturnsNullWithNullFlagKey() { @@ -341,22 +326,6 @@ public void TestRemoveForcedDecisionRemovesDecision() Assert.AreEqual(null, result); } - [Test] - public void TestRemoveForcedDecisionReturnsFalseForNullConfig() - { - var optly = new Optimizely(new FallbackProjectConfigManager(null)); - - var user = optly.CreateUserContext(UserID); - - var context = new OptimizelyDecisionContext("flagKey", null); - var decision = new OptimizelyForcedDecision("variationKey"); - var setResult = user.SetForcedDecision(context, decision); - - var result = user.RemoveForcedDecision(context); - - Assert.AreEqual(false, result); - } - [Test] public void TestRemoveAllForcedDecisionsRemovesDecisions() { @@ -386,22 +355,6 @@ public void TestRemoveAllForcedDecisionsRemovesDecisions() Assert.AreEqual(null, result3); } - [Test] - public void TestRemoveAllForcedDecisionsReturnsFalseForNullConfig() - { - var optly = new Optimizely(new FallbackProjectConfigManager(null)); - - var user = optly.CreateUserContext(UserID); - - var context = new OptimizelyDecisionContext("flagKey"); - var decision = new OptimizelyForcedDecision("variation"); - user.SetForcedDecision(context, decision); - - var result = user.RemoveAllForcedDecisions(); - - Assert.AreEqual(false, result); - } - [Test] public void DecideInvalidFlagKey() { diff --git a/OptimizelySDK/OptimizelyUserContext.cs b/OptimizelySDK/OptimizelyUserContext.cs index 9b7f7a0e..9e7b0ac8 100644 --- a/OptimizelySDK/OptimizelyUserContext.cs +++ b/OptimizelySDK/OptimizelyUserContext.cs @@ -232,12 +232,6 @@ public virtual void TrackEvent(string eventName, /// public bool SetForcedDecision(OptimizelyDecisionContext context, OptimizelyForcedDecision decision) { - if (!Optimizely.IsValid) - { - Logger.Log(LogLevel.ERROR, DecisionMessage.SDK_NOT_READY); - return false; - } - lock (mutex) { ForcedDecisionsStore[context] = decision; @@ -253,12 +247,6 @@ public bool SetForcedDecision(OptimizelyDecisionContext context, OptimizelyForce /// The variation key for a forced decision public OptimizelyForcedDecision GetForcedDecision(OptimizelyDecisionContext context) { - if (!Optimizely.IsValid) - { - Logger.Log(LogLevel.ERROR, DecisionMessage.SDK_NOT_READY); - return null; - } - if (context == null || context.FlagKey == null) { Logger.Log(LogLevel.WARN, "flagKey cannot be null"); @@ -291,12 +279,6 @@ public bool RemoveForcedDecision(OptimizelyDecisionContext context) Logger.Log(LogLevel.WARN, "FlagKey cannot be null"); return false; } - - if (!Optimizely.IsValid) - { - Logger.Log(LogLevel.ERROR, DecisionMessage.SDK_NOT_READY); - return false; - } lock (mutex) { @@ -310,12 +292,6 @@ public bool RemoveForcedDecision(OptimizelyDecisionContext context) /// Whether the clear was successful. public bool RemoveAllForcedDecisions() { - if (!Optimizely.IsValid) - { - Logger.Log(LogLevel.ERROR, DecisionMessage.SDK_NOT_READY); - return false; - } - lock (mutex) { ForcedDecisionsStore.RemoveAll();