Skip to content

Commit 6b8bc2b

Browse files
committed
fix tests
1 parent f4b5bcb commit 6b8bc2b

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

firebase-common/src/main/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ public Task<String> getHeartBeatsHeader() {
105105
GZIPOutputStream gzip = new GZIPOutputStream(out);
106106
gzip.write(output.toString().getBytes());
107107
gzip.close();
108-
return Base64.encodeToString(out.toString("UTF-8").getBytes(), Base64.URL_SAFE | Base64.NO_PADDING | Base64.NO_WRAP);
108+
return Base64.encodeToString(
109+
out.toString("UTF-8").getBytes(),
110+
Base64.URL_SAFE | Base64.NO_PADDING | Base64.NO_WRAP);
109111
}
110112
});
111113
}

firebase-common/src/test/java/com/google/firebase/heartbeatinfo/DefaultHeartBeatControllerTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public void generateHeartBeat_oneHeartBeat()
115115
.addOnCompleteListener(executor, getOnCompleteListener);
116116
String expected =
117117
Base64.getUrlEncoder()
118+
.withoutPadding()
118119
.encodeToString(
119120
compress(
120121
"{\"heartbeats\":[{\"agent\":\"test-agent\",\"date\":\"[2015-02-03]\"}],\"version\":\"2\"}")
@@ -134,7 +135,9 @@ public void firstNewThenOld_synchronizedCorrectly()
134135
new DefaultHeartBeatController(
135136
() -> heartBeatInfoStorage, logSources, executor, () -> publisher, context);
136137
String emptyString =
137-
Base64.getEncoder().encodeToString("{\"heartbeats\":[],\"version\":\"2\"}".getBytes());
138+
Base64.getUrlEncoder()
139+
.withoutPadding()
140+
.encodeToString("{\"heartbeats\":[],\"version\":\"2\"}".getBytes());
138141
controller.registerHeartBeat().addOnCompleteListener(executor, storeOnCompleteListener);
139142
storeOnCompleteListener.await();
140143
controller.getHeartBeatsHeader().addOnCompleteListener(executor, getOnCompleteListener);
@@ -157,6 +160,7 @@ public void firstOldThenNew_synchronizedCorrectly()
157160
() -> heartBeatInfoStorage, logSources, executor, () -> publisher, context);
158161
String emptyString =
159162
Base64.getUrlEncoder()
163+
.withoutPadding()
160164
.encodeToString(compress("{\"heartbeats\":[],\"version\":\"2\"}").getBytes());
161165
controller.registerHeartBeat().addOnCompleteListener(executor, storeOnCompleteListener);
162166
storeOnCompleteListener.await();
@@ -201,7 +205,10 @@ public void generateHeartBeat_twoHeartBeatsSameUserAgent()
201205
array.put(obj);
202206
output.put("heartbeats", array);
203207
output.put("version", "2");
204-
String expected = Base64.getUrlEncoder().encodeToString(compress(output.toString()).getBytes());
208+
String expected =
209+
Base64.getUrlEncoder()
210+
.withoutPadding()
211+
.encodeToString(compress(output.toString()).getBytes());
205212
assertThat(getOnCompleteListener.await().replace("\n", "")).isEqualTo(expected);
206213
}
207214

@@ -238,6 +245,7 @@ public void generateHeartBeat_twoHeartBeatstwoUserAgents()
238245
.addOnCompleteListener(executor, getOnCompleteListener);
239246
String expected =
240247
Base64.getUrlEncoder()
248+
.withoutPadding()
241249
.encodeToString(
242250
compress(
243251
"{\"heartbeats\":[{\"agent\":\"test-agent\",\"date\":\"[2015-03-02]\"},{\"agent\":\"test-agent-1\",\"date\":\"[2015-03-03]\"}],\"version\":\"2\"}")

0 commit comments

Comments
 (0)