Skip to content

Commit c644b7d

Browse files
committed
Format java files.
1 parent 9385b2a commit c644b7d

File tree

2 files changed

+44
-28
lines changed

2 files changed

+44
-28
lines changed

firebase-abt/src/main/java/com/google/firebase/abt/FirebaseABTesting.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ private void replaceAllExperimentsWith(List<AbtExperimentInfo> replacementExperi
246246

247247
// Remove experiments no longer assigned.
248248
List<ConditionalUserProperty> experimentsToRemove =
249-
getExperimentsToRemove(experimentsInAnalytics, replacementExperiments);
249+
getExperimentsToRemove(experimentsInAnalytics, replacementExperiments);
250250
removeExperiments(experimentsToRemove);
251251

252252
// Add newly assigned or updated (changed variant id).
@@ -257,7 +257,8 @@ private void replaceAllExperimentsWith(List<AbtExperimentInfo> replacementExperi
257257

258258
/** Returns this origin's experiments in Analytics that are no longer assigned to this App. */
259259
private ArrayList<ConditionalUserProperty> getExperimentsToRemove(
260-
List<AbtExperimentInfo> experimentsInAnalytics, List<AbtExperimentInfo> replacementExperiments) {
260+
List<AbtExperimentInfo> experimentsInAnalytics,
261+
List<AbtExperimentInfo> replacementExperiments) {
261262

262263
ArrayList<ConditionalUserProperty> experimentsToRemove = new ArrayList<>();
263264
for (AbtExperimentInfo experimentInAnalytics : experimentsInAnalytics) {
@@ -273,7 +274,8 @@ private ArrayList<ConditionalUserProperty> getExperimentsToRemove(
273274
* to this origin's list of experiments in Analytics.
274275
*/
275276
private ArrayList<AbtExperimentInfo> getExperimentsToAdd(
276-
List<AbtExperimentInfo> replacementExperiments, List<AbtExperimentInfo> experimentInfoFromAnalytics) {
277+
List<AbtExperimentInfo> replacementExperiments,
278+
List<AbtExperimentInfo> experimentInfoFromAnalytics) {
277279

278280
ArrayList<AbtExperimentInfo> experimentsToAdd = new ArrayList<>();
279281
for (AbtExperimentInfo replacementExperiment : replacementExperiments) {
@@ -285,12 +287,13 @@ private ArrayList<AbtExperimentInfo> getExperimentsToAdd(
285287
}
286288

287289
private boolean experimentsListContainsExperiment(
288-
List<AbtExperimentInfo> experiments, AbtExperimentInfo experiment) {
290+
List<AbtExperimentInfo> experiments, AbtExperimentInfo experiment) {
289291
String experimentId = experiment.getExperimentId();
290292
String variantId = experiment.getVariantId();
291293

292294
for (AbtExperimentInfo experimentInfo : experiments) {
293-
if (experimentInfo.getExperimentId().equals(experimentId) && experimentInfo.getVariantId().equals(variantId)) {
295+
if (experimentInfo.getExperimentId().equals(experimentId)
296+
&& experimentInfo.getVariantId().equals(variantId)) {
294297
return true;
295298
}
296299
}

firebase-abt/src/test/java/com/google/firebase/abt/FirebaseABTestingTest.java

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,16 @@ public class FirebaseABTestingTest {
6565
/*experimentStartTimeInEpochMillis=*/ 1000L);
6666
private static final AbtExperimentInfo TEST_ABT_EXPERIMENT_2_VARIANT_A =
6767
createExperimentInfo(
68-
TEST_EXPERIMENT_2_ID, TEST_VARIANT_ID_A, "trigger_event_2", /*experimentStartTimeInEpochMillis=*/ 2000L);
68+
TEST_EXPERIMENT_2_ID,
69+
TEST_VARIANT_ID_A,
70+
"trigger_event_2",
71+
/*experimentStartTimeInEpochMillis=*/ 2000L);
6972
private static final AbtExperimentInfo TEST_ABT_EXPERIMENT_2_VARIANT_B =
70-
createExperimentInfo(
71-
TEST_EXPERIMENT_2_ID, TEST_VARIANT_ID_B, "trigger_event_2", /*experimentStartTimeInEpochMillis=*/ 2000L);
73+
createExperimentInfo(
74+
TEST_EXPERIMENT_2_ID,
75+
TEST_VARIANT_ID_B,
76+
"trigger_event_2",
77+
/*experimentStartTimeInEpochMillis=*/ 2000L);
7278

7379
private static final int MAX_ALLOWED_EXPERIMENTS_IN_ANALYTICS = 100;
7480

@@ -114,7 +120,8 @@ public void replaceAllExperiments_noExperimentsInAnalytics_experimentsCorrectlyS
114120

115121
// Validates that TEST_ABT_EXPERIMENT_1 and TEST_ABT_EXPERIMENT_2 have been set in Analytics.
116122
assertThat(analyticsExperiment1.toStringMap()).isEqualTo(TEST_ABT_EXPERIMENT_1.toStringMap());
117-
assertThat(analyticsExperiment2.toStringMap()).isEqualTo(TEST_ABT_EXPERIMENT_2_VARIANT_A.toStringMap());
123+
assertThat(analyticsExperiment2.toStringMap())
124+
.isEqualTo(TEST_ABT_EXPERIMENT_2_VARIANT_A.toStringMap());
118125
}
119126

120127
@Test
@@ -127,7 +134,8 @@ public void replaceAllExperiments_existExperimentsInAnalytics_experimentsCorrect
127134
TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
128135

129136
AbtExperimentInfo newExperiment3 = createExperimentInfo("3", TEST_VARIANT_ID_A, "", 1000L);
130-
AbtExperimentInfo newExperiment4 = createExperimentInfo("4", TEST_VARIANT_ID_A, "trigger_event_4", 1000L);
137+
AbtExperimentInfo newExperiment4 =
138+
createExperimentInfo("4", TEST_VARIANT_ID_A, "trigger_event_4", 1000L);
131139

132140
// Simulates the case where experiment 1 is assigned (as before), experiment 2 is no longer
133141
// assigned; experiment 3 and experiment 4 are newly assigned.
@@ -154,43 +162,44 @@ public void replaceAllExperiments_existExperimentsInAnalytics_experimentsCorrect
154162
}
155163

156164
@Test
157-
public void replaceAllExperiments_existExperimentsInAnalyticsWithDifferentVariants_experimentsCorrectlySetInAnalytics()
165+
public void
166+
replaceAllExperiments_existExperimentsInAnalyticsWithDifferentVariants_experimentsCorrectlySetInAnalytics()
158167
throws Exception {
159168
when(mockAnalyticsConnector.getConditionalUserProperties(ORIGIN_SERVICE, ""))
160-
.thenReturn(
161-
Lists.newArrayList(
162-
TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
163-
TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
169+
.thenReturn(
170+
Lists.newArrayList(
171+
TEST_ABT_EXPERIMENT_1.toConditionalUserProperty(ORIGIN_SERVICE),
172+
TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
164173

165174
AbtExperimentInfo newExperiment3 = createExperimentInfo("3", "b", "", 1000L);
166175
AbtExperimentInfo newExperiment4 = createExperimentInfo("4", "a", "trigger_event_4", 1000L);
167176

168177
// Simulates the case where experiments 1 and 2 are removed,
169178
// experiment 2 is re-set with a new variant, and experiments 3 and 4 are newly added.
170179
firebaseAbt.replaceAllExperiments(
171-
Lists.newArrayList(
172-
TEST_ABT_EXPERIMENT_2_VARIANT_B.toStringMap(),
173-
newExperiment3.toStringMap(),
174-
newExperiment4.toStringMap()));
180+
Lists.newArrayList(
181+
TEST_ABT_EXPERIMENT_2_VARIANT_B.toStringMap(),
182+
newExperiment3.toStringMap(),
183+
newExperiment4.toStringMap()));
175184

176185
// Validates that experiment 1 is cleared, experiment 2 is updated,
177186
// and experiment 3 and experiment 4 are set in Analytics.
178187
ArgumentCaptor<ConditionalUserProperty> analyticsExperimentArgumentCaptor =
179-
ArgumentCaptor.forClass(ConditionalUserProperty.class);
188+
ArgumentCaptor.forClass(ConditionalUserProperty.class);
180189
verify(mockAnalyticsConnector, times(1))
181-
.clearConditionalUserProperty(TEST_EXPERIMENT_1_ID, null, null);
190+
.clearConditionalUserProperty(TEST_EXPERIMENT_1_ID, null, null);
182191
verify(mockAnalyticsConnector, times(1))
183-
.clearConditionalUserProperty(TEST_EXPERIMENT_2_ID, null, null);
192+
.clearConditionalUserProperty(TEST_EXPERIMENT_2_ID, null, null);
184193
verify(mockAnalyticsConnector, times(3))
185-
.setConditionalUserProperty(analyticsExperimentArgumentCaptor.capture());
194+
.setConditionalUserProperty(analyticsExperimentArgumentCaptor.capture());
186195

187196
List<ConditionalUserProperty> actualValues = analyticsExperimentArgumentCaptor.getAllValues();
188197
assertThat(AbtExperimentInfo.fromConditionalUserProperty(actualValues.get(0)).toStringMap())
189-
.isEqualTo(TEST_ABT_EXPERIMENT_2_VARIANT_B.toStringMap());
198+
.isEqualTo(TEST_ABT_EXPERIMENT_2_VARIANT_B.toStringMap());
190199
assertThat(AbtExperimentInfo.fromConditionalUserProperty(actualValues.get(1)).toStringMap())
191-
.isEqualTo(newExperiment3.toStringMap());
200+
.isEqualTo(newExperiment3.toStringMap());
192201
assertThat(AbtExperimentInfo.fromConditionalUserProperty(actualValues.get(2)).toStringMap())
193-
.isEqualTo(newExperiment4.toStringMap());
202+
.isEqualTo(newExperiment4.toStringMap());
194203
}
195204

196205
@Test
@@ -205,7 +214,8 @@ public void replaceAllExperiments_totalExperimentsExceedsAnalyticsLimit_oldExper
205214
TEST_ABT_EXPERIMENT_2_VARIANT_A.toConditionalUserProperty(ORIGIN_SERVICE)));
206215

207216
AbtExperimentInfo newExperiment3 = createExperimentInfo("3", TEST_VARIANT_ID_A, "", 1000L);
208-
AbtExperimentInfo newExperiment4 = createExperimentInfo("4", TEST_VARIANT_ID_A, "trigger_event_4", 1000L);
217+
AbtExperimentInfo newExperiment4 =
218+
createExperimentInfo("4", TEST_VARIANT_ID_A, "trigger_event_4", 1000L);
209219

210220
// Simulates the case where experiment 1 and 2 are assigned (as before), experiment 3 and
211221
// experiment 4 are newly assigned.
@@ -393,7 +403,10 @@ public void reportActiveExperiment_setsNullTriggerCondition() throws Exception {
393403
}
394404

395405
private static AbtExperimentInfo createExperimentInfo(
396-
String experimentId, String variantId, String triggerEventName, long experimentStartTimeInEpochMillis) {
406+
String experimentId,
407+
String variantId,
408+
String triggerEventName,
409+
long experimentStartTimeInEpochMillis) {
397410

398411
return new AbtExperimentInfo(
399412
experimentId,

0 commit comments

Comments
 (0)