Skip to content

Adding toString for DecisionNotification #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 3, 2019
Merged

Adding toString for DecisionNotification #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c8c42c
Adding toString for DecisionNotification
aliabbasrizvi May 3, 2019
f27befa
triggering tests
aliabbasrizvi May 3, 2019
b962fed
Merge branch 'master' into ali/add_decision_to_string
aliabbasrizvi May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core-api/src/main/java/com/optimizely/ab/config/FeatureVariable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ public static VariableType fromString(String variableTypeString) {

return null;
}

@Override
public String toString() {
return variableType;
}
}

private final String id;
Expand Down
13 changes: 12 additions & 1 deletion core-api/src/main/java/com/optimizely/ab/notification/DecisionNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,17 @@ public String getUserId() {
return decisionInfo;
}

@Override
public String toString() {
final StringBuilder sb = new StringBuilder("DecisionNotification{");
sb.append("type='").append(type).append('\'');
sb.append(", userId='").append(userId).append('\'');
sb.append(", attributes=").append(attributes);
sb.append(", decisionInfo=").append(decisionInfo);
sb.append('}');
return sb.toString();
}

public static ExperimentDecisionNotificationBuilder newExperimentDecisionNotificationBuilder() {
return new ExperimentDecisionNotificationBuilder();
}
Expand Down Expand Up @@ -303,7 +314,7 @@ public DecisionNotification build() {
decisionInfo.put(FEATURE_KEY, featureKey);
decisionInfo.put(FEATURE_ENABLED, featureEnabled);
decisionInfo.put(VARIABLE_KEY, variableKey);
decisionInfo.put(VARIABLE_TYPE, variableType);
decisionInfo.put(VARIABLE_TYPE, variableType.toString());
decisionInfo.put(VARIABLE_VALUE, variableValue);
SourceInfo sourceInfo = new RolloutSourceInfo();

Expand Down
12 changes: 6 additions & 6 deletions core-api/src/test/java/com/optimizely/ab/OptimizelyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3074,7 +3074,7 @@ public void getFeatureVariableWithListenerUserInExperimentFeatureOn() throws Exc
testDecisionInfoMap.put(FEATURE_KEY, validFeatureKey);
testDecisionInfoMap.put(FEATURE_ENABLED, true);
testDecisionInfoMap.put(VARIABLE_KEY, validVariableKey);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.STRING);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.STRING.toString());
testDecisionInfoMap.put(VARIABLE_VALUE, expectedValue);
testDecisionInfoMap.put(SOURCE, FeatureDecision.DecisionSource.FEATURE_TEST.toString());
testDecisionInfoMap.put(SOURCE_INFO, testSourceInfo);
Expand Down Expand Up @@ -3127,7 +3127,7 @@ public void getFeatureVariableWithListenerUserInExperimentFeatureOff() {
testDecisionInfoMap.put(FEATURE_KEY, validFeatureKey);
testDecisionInfoMap.put(FEATURE_ENABLED, false);
testDecisionInfoMap.put(VARIABLE_KEY, validVariableKey);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.STRING);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.STRING.toString());
testDecisionInfoMap.put(VARIABLE_VALUE, expectedValue);
testDecisionInfoMap.put(SOURCE, FeatureDecision.DecisionSource.FEATURE_TEST.toString());
testDecisionInfoMap.put(SOURCE_INFO, testSourceInfo);
Expand Down Expand Up @@ -3177,7 +3177,7 @@ public void getFeatureVariableWithListenerUserInRollOutFeatureOn() throws Except
testDecisionInfoMap.put(FEATURE_KEY, validFeatureKey);
testDecisionInfoMap.put(FEATURE_ENABLED, true);
testDecisionInfoMap.put(VARIABLE_KEY, validVariableKey);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.STRING);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.STRING.toString());
testDecisionInfoMap.put(VARIABLE_VALUE, expectedValue);
testDecisionInfoMap.put(SOURCE, FeatureDecision.DecisionSource.ROLLOUT.toString());
testDecisionInfoMap.put(SOURCE_INFO, Collections.EMPTY_MAP);
Expand Down Expand Up @@ -3227,7 +3227,7 @@ public void getFeatureVariableWithListenerUserNotInRollOutFeatureOff() {
testDecisionInfoMap.put(FEATURE_KEY, validFeatureKey);
testDecisionInfoMap.put(FEATURE_ENABLED, false);
testDecisionInfoMap.put(VARIABLE_KEY, validVariableKey);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.BOOLEAN);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.BOOLEAN.toString());
testDecisionInfoMap.put(VARIABLE_VALUE, expectedValue);
testDecisionInfoMap.put(SOURCE, FeatureDecision.DecisionSource.ROLLOUT.toString());
testDecisionInfoMap.put(SOURCE_INFO, Collections.EMPTY_MAP);
Expand Down Expand Up @@ -3276,7 +3276,7 @@ public void getFeatureVariableIntegerWithListenerUserInRollOutFeatureOn() {
testDecisionInfoMap.put(FEATURE_KEY, validFeatureKey);
testDecisionInfoMap.put(FEATURE_ENABLED, true);
testDecisionInfoMap.put(VARIABLE_KEY, validVariableKey);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.INTEGER);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.INTEGER.toString());
testDecisionInfoMap.put(VARIABLE_VALUE, expectedValue);
testDecisionInfoMap.put(SOURCE, FeatureDecision.DecisionSource.ROLLOUT.toString());
testDecisionInfoMap.put(SOURCE_INFO, Collections.EMPTY_MAP);
Expand Down Expand Up @@ -3328,7 +3328,7 @@ public void getFeatureVariableDoubleWithListenerUserInExperimentFeatureOn() thro
testDecisionInfoMap.put(FEATURE_KEY, validFeatureKey);
testDecisionInfoMap.put(FEATURE_ENABLED, true);
testDecisionInfoMap.put(VARIABLE_KEY, validVariableKey);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.DOUBLE);
testDecisionInfoMap.put(VARIABLE_TYPE, FeatureVariable.VariableType.DOUBLE.toString());
testDecisionInfoMap.put(VARIABLE_VALUE, 3.14);
testDecisionInfoMap.put(SOURCE, FeatureDecision.DecisionSource.FEATURE_TEST.toString());
testDecisionInfoMap.put(SOURCE_INFO, testSourceInfo);
Expand Down
24 changes: 18 additions & 6 deletions core-api/src/test/java/com/optimizely/ab/notification/DecisionNotificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,14 @@ public class DecisionNotificationTest {
private static final String EXPERIMENT_KEY = "experimentKey";
private static final String FEATURE_KEY = "featureKey";
private static final String FEATURE_VARIABLE_KEY = "featureVariableKey";
private static final String FEATURE_TEST = "featureTest";
private static final String FEATURE_TEST_VARIATION = "featureTestVariation";
private static final String USER_ID = "userID";
private static final Map<String, String> USER_ATTRIBUTES = Collections.singletonMap("user", "attr");
private static final RolloutSourceInfo rolloutSourceInfo = mock(RolloutSourceInfo.class);
private static final Variation VARIATION = mock(Variation.class);

private FeatureTestSourceInfo featureTestSourceInfo;
private RolloutSourceInfo rolloutSourceInfo;
private DecisionNotification experimentDecisionNotification;
private DecisionNotification featureDecisionNotification;
private DecisionNotification featureVariableDecisionNotification;
Expand All @@ -57,13 +60,15 @@ public void setUp() {
.withVariation(VARIATION)
.withType(NotificationCenter.DecisionNotificationType.AB_TEST.toString())
.build();
featureTestSourceInfo = new FeatureTestSourceInfo(FEATURE_TEST, FEATURE_TEST_VARIATION);
rolloutSourceInfo = new RolloutSourceInfo();
featureDecisionNotification = DecisionNotification.newFeatureDecisionNotificationBuilder()
.withUserId(USER_ID)
.withFeatureKey(FEATURE_KEY)
.withFeatureEnabled(FEATURE_ENABLED)
.withSource(FeatureDecision.DecisionSource.ROLLOUT)
.withSource(FeatureDecision.DecisionSource.FEATURE_TEST)
.withAttributes(USER_ATTRIBUTES)
.withSourceInfo(rolloutSourceInfo)
.withSourceInfo(featureTestSourceInfo)
.build();
featureVariableDecisionNotification = DecisionNotification.newFeatureVariableDecisionNotificationBuilder()
.withUserId(USER_ID)
Expand Down Expand Up @@ -108,19 +113,26 @@ public void testGetDecisionInfo() {
Map<String, ?> actualFeatureDecisionInfo = featureDecisionNotification.getDecisionInfo();
assertFalse((Boolean) actualFeatureDecisionInfo.get(DecisionNotification.FeatureDecisionNotificationBuilder.FEATURE_ENABLED));
assertEquals(FEATURE_KEY, actualFeatureDecisionInfo.get(DecisionNotification.FeatureDecisionNotificationBuilder.FEATURE_KEY));
assertEquals(FeatureDecision.DecisionSource.ROLLOUT.toString(), actualFeatureDecisionInfo.get(DecisionNotification.FeatureDecisionNotificationBuilder.SOURCE));
assertEquals(rolloutSourceInfo.get(), actualFeatureDecisionInfo.get(DecisionNotification.FeatureDecisionNotificationBuilder.SOURCE_INFO));
assertEquals(FeatureDecision.DecisionSource.FEATURE_TEST.toString(), actualFeatureDecisionInfo.get(DecisionNotification.FeatureDecisionNotificationBuilder.SOURCE));
assertEquals(featureTestSourceInfo.get(), actualFeatureDecisionInfo.get(DecisionNotification.FeatureDecisionNotificationBuilder.SOURCE_INFO));

// Assert for Feature Variable's DecisionInfo
Map<String, ?> actualFeatureVariableDecisionInfo = featureVariableDecisionNotification.getDecisionInfo();
assertTrue((Boolean) actualFeatureVariableDecisionInfo.get(DecisionNotification.FeatureVariableDecisionNotificationBuilder.FEATURE_ENABLED));
assertEquals(FEATURE_KEY, actualFeatureVariableDecisionInfo.get(DecisionNotification.FeatureVariableDecisionNotificationBuilder.FEATURE_KEY));
assertEquals(FEATURE_VARIABLE_KEY, actualFeatureVariableDecisionInfo.get(DecisionNotification.FeatureVariableDecisionNotificationBuilder.VARIABLE_KEY));
assertEquals(FeatureVariable.VariableType.STRING, actualFeatureVariableDecisionInfo.get(DecisionNotification.FeatureVariableDecisionNotificationBuilder.VARIABLE_TYPE));
assertEquals(FeatureVariable.VariableType.STRING.toString(), actualFeatureVariableDecisionInfo.get(DecisionNotification.FeatureVariableDecisionNotificationBuilder.VARIABLE_TYPE));
assertEquals(FeatureDecision.DecisionSource.ROLLOUT.toString(), actualFeatureVariableDecisionInfo.get(DecisionNotification.FeatureVariableDecisionNotificationBuilder.SOURCE));
assertEquals(rolloutSourceInfo.get(), actualFeatureVariableDecisionInfo.get(DecisionNotification.FeatureVariableDecisionNotificationBuilder.SOURCE_INFO));
}

@Test
public void testToString() {
assertEquals("DecisionNotification{type='ab-test', userId='userID', attributes={user=attr}, decisionInfo={experimentKey=experimentKey, variationKey=null}}", experimentDecisionNotification.toString());
assertEquals("DecisionNotification{type='feature', userId='userID', attributes={user=attr}, decisionInfo={featureEnabled=false, sourceInfo={experimentKey=featureTest, variationKey=featureTestVariation}, source=feature-test, featureKey=featureKey}}", featureDecisionNotification.toString());
assertEquals("DecisionNotification{type='feature-variable', userId='userID', attributes={user=attr}, decisionInfo={variableType=string, featureEnabled=true, sourceInfo={}, variableValue=null, variableKey=featureVariableKey, source=rollout, featureKey=featureKey}}", featureVariableDecisionNotification.toString());
}

@Test(expected = OptimizelyRuntimeException.class)
public void nullTypeFailsExperimentNotificationBuild() {
DecisionNotification.newExperimentDecisionNotificationBuilder()
Expand Down