Skip to content

Commit a4e843b

Browse files
author
Vignesh Raja
authored
Change key to ID in all variable names within UserProfile (#76)
1 parent 38b060a commit a4e843b

File tree

3 files changed

+124
-124
lines changed

3 files changed

+124
-124
lines changed

‎user-profile/src/androidTest/java/com/optimizely/ab/android/user_profile/AndroidUserProfileTest.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -80,131 +80,131 @@ public void teardown() {
8080
@Test
8181
public void saveActivation() {
8282
String userId = "user1";
83-
String expKey = "exp1";
84-
String varKey = "var1";
85-
assertTrue(androidUserProfile.save(userId, expKey, varKey));
83+
String expId = "1";
84+
String varId = "2";
85+
assertTrue(androidUserProfile.save(userId, expId, varId));
8686
try {
8787
executor.awaitTermination(5, TimeUnit.SECONDS);
8888
} catch (InterruptedException e) {
8989
fail("Time out");
9090
}
91-
assertEquals(varKey, androidUserProfile.lookup(userId, expKey));
91+
assertEquals(varId, androidUserProfile.lookup(userId, expId));
9292
}
9393

9494
@Test
9595
public void saveActivationNullUserId() {
96-
assertFalse(androidUserProfile.save(null, "exp1", "var1"));
97-
verify(logger).error("Received null userId, unable to save activation");
96+
assertFalse(androidUserProfile.save(null, "1", "2"));
97+
verify(logger).error("Received null userId, unable to save activation.");
9898
}
9999

100100
@Test
101-
public void saveActivationNullExperimentKey() {
102-
assertFalse(androidUserProfile.save("foo", null, "var1"));
103-
verify(logger).error("Received null experiment key, unable to save activation");
101+
public void saveActivationNullExperimentId() {
102+
assertFalse(androidUserProfile.save("foo", null, "1"));
103+
verify(logger).error("Received null experiment ID, unable to save activation.");
104104
}
105105

106106
@Test
107-
public void saveActivationNullVariationKey() {
108-
assertFalse(androidUserProfile.save("foo", "exp1", null));
109-
verify(logger).error("Received null variation key, unable to save activation");
107+
public void saveActivationNullVariationId() {
108+
assertFalse(androidUserProfile.save("foo", "1", null));
109+
verify(logger).error("Received null variation ID, unable to save activation.");
110110
}
111111

112112
@Test
113113
public void saveActivationEmptyUserId() {
114-
assertFalse(androidUserProfile.save("", "exp1", "var1"));
115-
verify(logger).error("Received empty user id, unable to save activation");
114+
assertFalse(androidUserProfile.save("", "1", "2"));
115+
verify(logger).error("Received empty user ID, unable to save activation.");
116116
}
117117

118118
@Test
119-
public void saveActivationEmptyExperimentKey() {
120-
assertFalse(androidUserProfile.save("foo", "", "var1"));
121-
verify(logger).error("Received empty experiment key, unable to save activation");
119+
public void saveActivationEmptyExperimentId() {
120+
assertFalse(androidUserProfile.save("foo", "", "1"));
121+
verify(logger).error("Received empty experiment ID, unable to save activation.");
122122
}
123123

124124
@Test
125-
public void saveActivationEmptyVariationKey() {
126-
assertFalse(androidUserProfile.save("foo", "exp1", ""));
127-
verify(logger).error("Received empty variation key, unable to save activation");
125+
public void saveActivationEmptyVariationId() {
126+
assertFalse(androidUserProfile.save("foo", "1", ""));
127+
verify(logger).error("Received empty variation ID, unable to save activation.");
128128
}
129129

130130
@Test
131131
public void lookupActivationNullUserId() {
132-
assertNull(androidUserProfile.lookup(null, "exp1"));
133-
verify(logger).error("Received null user id, unable to lookup activation");
132+
assertNull(androidUserProfile.lookup(null, "1"));
133+
verify(logger).error("Received null user ID, unable to lookup activation.");
134134
}
135135

136136
@Test
137-
public void lookupActivationNullExperimentKey() {
138-
assertNull(androidUserProfile.lookup("foo", null));
139-
verify(logger).error("Received null experiment key, unable to lookup activation");
137+
public void lookupActivationNullExperimentId() {
138+
assertNull(androidUserProfile.lookup("1", null));
139+
verify(logger).error("Received null experiment ID, unable to lookup activation.");
140140
}
141141

142142
@Test
143143
public void lookupActivationEmptyUserId() {
144-
assertNull(androidUserProfile.lookup("", "exp1"));
145-
verify(logger).error("Received empty user id, unable to lookup activation");
144+
assertNull(androidUserProfile.lookup("", "1"));
145+
verify(logger).error("Received empty user ID, unable to lookup activation.");
146146
}
147147

148148
@Test
149-
public void lookupActivationEmptyExperimentKey() {
149+
public void lookupActivationEmptyExperimentId() {
150150
assertNull(androidUserProfile.lookup("foo", ""));
151-
verify(logger).error("Received empty experiment key, unable to lookup activation");
151+
verify(logger).error("Received empty experiment ID, unable to lookup activation.");
152152
}
153153

154154
@Test
155155
public void removeExistingActivation() {
156-
androidUserProfile.save("user1", "exp1", "var1");
157-
assertTrue(androidUserProfile.remove("user1", "exp1"));
158-
assertNull(androidUserProfile.lookup("user1", "exp1"));
156+
androidUserProfile.save("user1", "1", "2");
157+
assertTrue(androidUserProfile.remove("user1", "1"));
158+
assertNull(androidUserProfile.lookup("user1", "1"));
159159
}
160160

161161
@Test
162162
public void removeNonExistingActivation() {
163-
assertFalse(androidUserProfile.remove("user1", "exp1"));
163+
assertFalse(androidUserProfile.remove("user1", "1"));
164164
}
165165

166166
@Test
167167
public void removeActivationNullUserId() {
168-
assertFalse(androidUserProfile.remove(null, "exp1"));
169-
verify(logger).error("Received null user id, unable to remove activation");
168+
assertFalse(androidUserProfile.remove(null, "1"));
169+
verify(logger).error("Received null user ID, unable to remove activation.");
170170
}
171171

172172
@Test
173-
public void removeActivationNullExperimentKey() {
173+
public void removeActivationNullExperimentId() {
174174
assertFalse(androidUserProfile.remove("foo", null));
175-
verify(logger).error("Received null experiment key, unable to remove activation");
175+
verify(logger).error("Received null experiment ID, unable to remove activation.");
176176
}
177177

178178
@Test
179179
public void removeActivationEmptyUserId() {
180-
assertFalse(androidUserProfile.remove("", "exp1"));
181-
verify(logger).error("Received empty user id, unable to remove activation");
180+
assertFalse(androidUserProfile.remove("", "1"));
181+
verify(logger).error("Received empty user ID, unable to remove activation.");
182182
}
183183

184184
@Test
185-
public void removeActivationEmptyExperimentKey() {
185+
public void removeActivationEmptyExperimentId() {
186186
assertFalse(androidUserProfile.remove("foo", ""));
187-
verify(logger).error("Received empty experiment key, unable to remove activation");
187+
verify(logger).error("Received empty experiment ID, unable to remove activation.");
188188
}
189189

190190
@Test
191191
public void startHandlesJSONException() throws IOException {
192192
assertTrue(cache.save(diskUserProfileCache.getFileName(), "{"));
193193
androidUserProfile.start();
194-
verify(logger).error(eq("Unable to parse user profile cache"), any(JSONException.class));
194+
verify(logger).error(eq("Unable to parse user profile cache."), any(JSONException.class));
195195
}
196196

197197
@Test
198198
public void start() throws JSONException {
199199
androidUserProfile.start();
200-
androidUserProfile.save("user1", "exp1", "var1");
201-
androidUserProfile.save("user1", "exp2", "var2");
200+
androidUserProfile.save("user1", "1", "3");
201+
androidUserProfile.save("user1", "2", "4");
202202

203-
Map<String, String> expKeyToVarKeyMap = new HashMap<>();
204-
expKeyToVarKeyMap.put("exp1", "var1");
205-
expKeyToVarKeyMap.put("exp2", "var2");
203+
Map<String, String> expIdToVarIdMap = new HashMap<>();
204+
expIdToVarIdMap.put("1", "3");
205+
expIdToVarIdMap.put("2", "4");
206206
Map<String, Map<String, String>> profileMap = new HashMap<>();
207-
profileMap.put("user1", expKeyToVarKeyMap);
207+
profileMap.put("user1", expIdToVarIdMap);
208208

209209
assertEquals(profileMap, memoryUserProfileCache);
210210
}

‎user-profile/src/androidTest/java/com/optimizely/ab/android/user_profile/WriteThroughCacheFactoryTest.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,25 @@ public void startWriteCacheTask() throws JSONException {
6969
new AndroidUserProfile.WriteThroughCacheTaskFactory(diskUserProfileCache,
7070
new HashMap<String, Map<String, String>>(), executor, logger);
7171

72-
writeThroughCacheTaskFactory.startWriteCacheTask("user1", "exp1", "var1");
72+
writeThroughCacheTaskFactory.startWriteCacheTask("user1", "1", "2");
7373
try {
7474
executor.awaitTermination(5, TimeUnit.SECONDS);
7575
} catch (InterruptedException e) {
7676
fail("Timed out");
7777
}
7878

79-
verify(logger).info("Updated in memory user profile");
79+
verify(logger).info("Updated in memory user profile.");
8080
assertTrue(writeThroughCacheTaskFactory.getMemoryUserProfileCache().containsKey("user1"));
8181
Map<String, String> activation = writeThroughCacheTaskFactory.getMemoryUserProfileCache().get("user1");
82-
assertTrue(activation.containsKey("exp1"));
83-
assertEquals("var1", activation.get("exp1"));
82+
assertTrue(activation.containsKey("1"));
83+
assertEquals("2", activation.get("1"));
8484

8585
final JSONObject json = diskUserProfileCache.load();
8686
assertTrue(json.has("user1"));
8787
final JSONObject user1 = json.getJSONObject("user1");
88-
assertTrue(user1.has("exp1"));
89-
assertEquals("var1", user1.getString("exp1"));
90-
verify(logger).info("Persisted user in variation {} for experiment {}.", "var1", "exp1");
88+
assertTrue(user1.has("1"));
89+
assertEquals("2", user1.getString("1"));
90+
verify(logger).info("Persisted user in variation {} for experiment {}.", "2", "1");
9191

9292
cache.delete(diskUserProfileCache.getFileName());
9393
}
@@ -105,19 +105,19 @@ public void startWriteCacheTaskFail() throws JSONException {
105105

106106
when(cache.save(diskUserProfileCache.getFileName(), json.toString())).thenReturn(false);
107107

108-
writeThroughCacheTaskFactory.startWriteCacheTask("user1", "exp1", "var1");
108+
writeThroughCacheTaskFactory.startWriteCacheTask("user1", "1", "2");
109109
try {
110110
executor.awaitTermination(5, TimeUnit.SECONDS);
111111
} catch (InterruptedException e) {
112112
fail("Timed out");
113113
}
114114

115-
verify(logger).info("Updated in memory user profile");
115+
verify(logger).info("Updated in memory user profile.");
116116
assertTrue(writeThroughCacheTaskFactory.getMemoryUserProfileCache().containsKey("user1"));
117117
Map<String, String> activation = writeThroughCacheTaskFactory.getMemoryUserProfileCache().get("user1");
118-
assertFalse(activation.containsKey("exp1"));
118+
assertFalse(activation.containsKey("1"));
119119

120-
verify(logger).error("Failed to persist user in variation {} for experiment {}.", "var1", "exp1");
120+
verify(logger).error("Failed to persist user in variation {} for experiment {}.", "2", "1");
121121
}
122122

123123
@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
@@ -129,26 +129,26 @@ public void startRemoveCacheTask() throws JSONException, IOException {
129129
new AndroidUserProfile.WriteThroughCacheTaskFactory(diskUserProfileCache,
130130
new HashMap<String, Map<String, String>>(), executor, logger);
131131

132-
diskUserProfileCache.save("user1", "exp1", "var1");
132+
diskUserProfileCache.save("user1", "1", "2");
133133

134134
Map<String, String> activation = new HashMap<>();
135-
activation.put("exp1", "var1");
135+
activation.put("1", "2");
136136
writeThroughCacheTaskFactory.getMemoryUserProfileCache().put("user1", activation);
137137

138-
writeThroughCacheTaskFactory.startRemoveCacheTask("user1", "exp1", "var1");
138+
writeThroughCacheTaskFactory.startRemoveCacheTask("user1", "1", "2");
139139
try {
140140
executor.awaitTermination(5, TimeUnit.SECONDS);
141141
} catch (InterruptedException e) {
142142
fail("Timed out");
143143
}
144144

145-
verify(logger).info("Removed experimentKey: {} variationKey: {} record for user: {} from memory", "exp1", "var1", "user1");
145+
verify(logger).info("Removed experimentId: {} variationId: {} record for user: {} from memory.", "1", "2", "user1");
146146
JSONObject json = diskUserProfileCache.load();
147147
assertTrue(json.has("user1"));
148148
json = json.getJSONObject("user1");
149-
assertFalse(json.has("exp1"));
150-
assertFalse(writeThroughCacheTaskFactory.getMemoryUserProfileCache().get("user1").containsKey("exp1"));
151-
verify(logger).info("Removed experimentKey: {} variationKey: {} record for user: {} from disk", "exp1", "var1", "user1");
149+
assertFalse(json.has("1"));
150+
assertFalse(writeThroughCacheTaskFactory.getMemoryUserProfileCache().get("user1").containsKey("1"));
151+
verify(logger).info("Removed experimentId: {} variationId: {} record for user: {} from disk.", "1", "2", "user1");
152152
}
153153

154154
@RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
@@ -163,25 +163,25 @@ public void startRemoveCacheTaskFail() throws JSONException, IOException {
163163
when(cache.save(diskUserProfileCache.getFileName(), getJsonObject().toString())).thenReturn(false);
164164

165165
Map<String, String> activation = new HashMap<>();
166-
activation.put("exp1", "var1");
166+
activation.put("1", "2");
167167
writeThroughCacheTaskFactory.getMemoryUserProfileCache().put("user1", activation);
168-
writeThroughCacheTaskFactory.startRemoveCacheTask("user1", "exp1", "var1");
168+
writeThroughCacheTaskFactory.startRemoveCacheTask("user1", "1", "2");
169169
try {
170170
executor.awaitTermination(5, TimeUnit.SECONDS);
171171
} catch (InterruptedException e) {
172172
fail("Timed out");
173173
}
174174

175-
verify(logger).info("Removed experimentKey: {} variationKey: {} record for user: {} from memory", "exp1", "var1", "user1");
176-
verify(logger).error("Restored experimentKey: {} variationKey: {} record for user: {} to memory", "exp1", "var1","user1");
177-
assertTrue(writeThroughCacheTaskFactory.getMemoryUserProfileCache().get("user1").containsKey("exp1"));
175+
verify(logger).info("Removed experimentId: {} variationId: {} record for user: {} from memory.", "1", "2", "user1");
176+
verify(logger).error("Restored experimentId: {} variationId: {} record for user: {} to memory.", "1", "2","user1");
177+
assertTrue(writeThroughCacheTaskFactory.getMemoryUserProfileCache().get("user1").containsKey("1"));
178178
}
179179

180180
@NonNull
181181
private JSONObject getJsonObject() throws JSONException {
182182
JSONObject json = new JSONObject();
183183
JSONObject user1 = new JSONObject();
184-
user1.put("exp1", "var1");
184+
user1.put("1", "2");
185185
json.put("user1", user1);
186186
return json;
187187
}

0 commit comments

Comments
 (0)