diff --git a/core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java b/core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java index 0a785c550..53eb26cf6 100644 --- a/core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java +++ b/core-api/src/main/java/com/optimizely/ab/OptimizelyUserContext.java @@ -198,10 +198,6 @@ public void trackEvent(@Nonnull String eventName) throws UnknownEventTypeExcepti */ public Boolean setForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDecisionContext, @Nonnull OptimizelyForcedDecision optimizelyForcedDecision) { - if (optimizely.getOptimizelyConfig() == null) { - logger.error("Optimizely SDK not ready."); - return false; - } // Check if the forcedDecisionsMap has been initialized yet or not if (forcedDecisionsMap == null ){ // Thread-safe implementation of HashMap @@ -219,10 +215,6 @@ public Boolean setForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDe */ @Nullable public OptimizelyForcedDecision getForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDecisionContext) { - if (optimizely.getOptimizelyConfig() == null) { - logger.error("Optimizely SDK not ready."); - return null; - } return findForcedDecision(optimizelyDecisionContext); } @@ -247,11 +239,6 @@ public OptimizelyForcedDecision findForcedDecision(@Nonnull OptimizelyDecisionCo * @return Returns a boolean, true if successfully removed, otherwise false */ public boolean removeForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDecisionContext) { - if (optimizely.getOptimizelyConfig() == null) { - logger.error("Optimizely SDK not ready."); - return false; - } - try { if (forcedDecisionsMap != null) { if (forcedDecisionsMap.remove(optimizelyDecisionContext.getKey()) != null) { @@ -271,10 +258,6 @@ public boolean removeForcedDecision(@Nonnull OptimizelyDecisionContext optimizel * @return Returns a boolean, True if successfully, otherwise false */ public boolean removeAllForcedDecisions() { - if (optimizely.getProjectConfig() == null) { - logger.error("Optimizely SDK not ready."); - return false; - } // Clear both maps for with and without ruleKey if (forcedDecisionsMap != null) { forcedDecisionsMap.clear(); diff --git a/core-api/src/test/java/com/optimizely/ab/OptimizelyUserContextTest.java b/core-api/src/test/java/com/optimizely/ab/OptimizelyUserContextTest.java index 6197d878b..ef91ca596 100644 --- a/core-api/src/test/java/com/optimizely/ab/OptimizelyUserContextTest.java +++ b/core-api/src/test/java/com/optimizely/ab/OptimizelyUserContextTest.java @@ -82,11 +82,13 @@ public void optimizelyUserContext_withAttributes() { @Test public void optimizelyUserContext_noAttributes() { - OptimizelyUserContext user = new OptimizelyUserContext(optimizely, userId); + OptimizelyUserContext user_1 = new OptimizelyUserContext(optimizely, userId); + OptimizelyUserContext user_2 = new OptimizelyUserContext(optimizely, userId); - assertEquals(user.getOptimizely(), optimizely); - assertEquals(user.getUserId(), userId); - assertTrue(user.getAttributes().isEmpty()); + assertEquals(user_1.getOptimizely(), optimizely); + assertEquals(user_1.getUserId(), userId); + assertTrue(user_1.getAttributes().isEmpty()); + assertEquals(user_1.hashCode(), user_2.hashCode()); } @Test @@ -1263,21 +1265,6 @@ public void setForcedDecisionWithoutRuleKeyTest() { } - @Test - public void setForcedDecisionWithoutRuleKeyTestSdkNotReady() { - String flagKey = "55555"; - String variationKey = "33333"; - Optimizely optimizely = new Optimizely.Builder().build(); - OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext( - optimizely, - userId, - Collections.emptyMap()); - - OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, null); - OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey); - assertFalse(optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision)); - } - @Test public void getForcedVariationWithRuleKey() { String flagKey = "55555"; @@ -1330,22 +1317,6 @@ public void getForcedVariationWithoutRuleKey() { assertEquals(variationKey, optimizelyUserContext.getForcedDecision(optimizelyDecisionContext).getVariationKey()); } - @Test - public void getForcedVariationWithoutRuleKeySdkNotReady() { - String flagKey = "55555"; - String variationKey = "33333"; - Optimizely optimizely = new Optimizely.Builder().build(); - OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext( - optimizely, - userId, - Collections.emptyMap()); - - OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, null); - OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey); - - optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision); - assertNull(optimizelyUserContext.getForcedDecision(optimizelyDecisionContext)); - } @Test public void failedGetForcedDecisionWithoutRuleKey() { @@ -1434,22 +1405,6 @@ public void removeForcedDecisionWithIncorrectFlagKey() { assertFalse(optimizelyUserContext.removeForcedDecision(incorrectOptimizelyDecisionContext)); } - @Test - public void removeForcedDecisionWithoutRuleKeySdkNotReady() { - String flagKey = "flag2"; - String variationKey = "33333"; - Optimizely optimizely = new Optimizely.Builder().build(); - OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext( - optimizely, - userId, - Collections.emptyMap()); - - OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, null); - OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey); - - optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision); - assertFalse(optimizelyUserContext.removeForcedDecision(optimizelyDecisionContext)); - } @Test public void removeForcedDecisionWithIncorrectFlagKeyButSimilarRuleKey() { @@ -1487,23 +1442,6 @@ public void removeAllForcedDecisions() { assertTrue(optimizelyUserContext.removeAllForcedDecisions()); } - @Test - public void removeAllForcedDecisionsSdkNotReady() { - String flagKey = "55555"; - String ruleKey = "77777"; - String variationKey = "33333"; - Optimizely optimizely = new Optimizely.Builder().build(); - OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext( - optimizely, - userId, - Collections.emptyMap()); - - OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, ruleKey); - OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey); - - optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision); - assertFalse(optimizelyUserContext.removeAllForcedDecisions()); - } @Test public void findValidatedForcedDecisionWithRuleKey() {