Skip to content

Commit 7de7186

Browse files
committed
Regenerate Java TUS event key helpers
1 parent cc6750f commit 7de7186

1 file changed

Lines changed: 79 additions & 2 deletions

File tree

src/test/java/io/tus/java/client/TestGeneratedTusRuntimeEvents.java

Lines changed: 79 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,13 +574,18 @@ public void testSyncUploaderEmitsGeneratedProgressAndChunkEvents() throws Except
574574
uploader.setProgressListener(new TusUploader.ProgressListener() {
575575
@Override
576576
public void onProgress(long bytesSent, long bytesTotal) {
577-
events.add("progress:" + bytesSent + ":" + bytesTotal);
577+
events.add(generatedTusEventKeyProgress(
578+
generatedTusEventKeyNumber(bytesSent),
579+
generatedTusEventKeyNumber(bytesTotal)));
578580
}
579581
});
580582
uploader.setChunkCompleteListener(new TusUploader.ChunkCompleteListener() {
581583
@Override
582584
public void onChunkComplete(long chunkSize, long bytesAccepted, long bytesTotal) {
583-
events.add("chunk-complete:" + chunkSize + ":" + bytesAccepted + ":" + bytesTotal);
585+
events.add(generatedTusEventKeyChunkComplete(
586+
generatedTusEventKeyNumber(chunkSize),
587+
generatedTusEventKeyNumber(bytesAccepted),
588+
generatedTusEventKeyNumber(bytesTotal)));
584589
}
585590
});
586591

@@ -594,6 +599,78 @@ public void onChunkComplete(long chunkSize, long bytesAccepted, long bytesTotal)
594599
}
595600
}
596601

602+
private static String generatedTusEventKey(String kind, String... parts) {
603+
if (parts.length == 0) {
604+
return kind;
605+
}
606+
607+
return kind + ":" + String.join(":", parts);
608+
}
609+
610+
private static String generatedTusEventKeyNumber(long value) {
611+
return Long.toString(value);
612+
}
613+
614+
private static String generatedTusEventKeyAfterResponse(String requestIndex) {
615+
return generatedTusEventKey("after-response", requestIndex);
616+
}
617+
618+
private static String generatedTusEventKeyBeforeRequest(String requestIndex) {
619+
return generatedTusEventKey("before-request", requestIndex);
620+
}
621+
622+
private static String generatedTusEventKeyChunkComplete(String chunkSize, String bytesAccepted, String bytesTotal) {
623+
return generatedTusEventKey("chunk-complete", chunkSize, bytesAccepted, bytesTotal);
624+
}
625+
626+
private static String generatedTusEventKeyFingerprint(String fingerprint) {
627+
return generatedTusEventKey("fingerprint", fingerprint);
628+
}
629+
630+
private static String generatedTusEventKeyProgress(String bytesSent, String bytesTotal) {
631+
return generatedTusEventKey("progress", bytesSent, bytesTotal);
632+
}
633+
634+
private static String generatedTusEventKeyRequestAbort(String requestIndex) {
635+
return generatedTusEventKey("request-abort", requestIndex);
636+
}
637+
638+
private static String generatedTusEventKeyRetrySchedule(String delay) {
639+
return generatedTusEventKey("retry-schedule", delay);
640+
}
641+
642+
private static String generatedTusEventKeyShouldRetry(String retryAttempt, String decision) {
643+
return generatedTusEventKey("should-retry", retryAttempt, decision);
644+
}
645+
646+
private static String generatedTusEventKeySourceClose() {
647+
return generatedTusEventKey("source-close");
648+
}
649+
650+
private static String generatedTusEventKeySourceOpen(String inputKind, String size) {
651+
return generatedTusEventKey("source-open", inputKind, size);
652+
}
653+
654+
private static String generatedTusEventKeySuccess() {
655+
return generatedTusEventKey("success");
656+
}
657+
658+
private static String generatedTusEventKeyUploadUrlAvailable() {
659+
return generatedTusEventKey("upload-url-available");
660+
}
661+
662+
private static String generatedTusEventKeyUrlStorageAdd(String fingerprint, String uploadUrl) {
663+
return generatedTusEventKey("url-storage-add", fingerprint, uploadUrl);
664+
}
665+
666+
private static String generatedTusEventKeyUrlStorageFind(String fingerprint, String count) {
667+
return generatedTusEventKey("url-storage-find", fingerprint, count);
668+
}
669+
670+
private static String generatedTusEventKeyUrlStorageRemove(String urlStorageKey) {
671+
return generatedTusEventKey("url-storage-remove", urlStorageKey);
672+
}
673+
597674
private TusUploader uploaderFor(TusClient client, GeneratedTusRuntimeEventCase testCase)
598675
throws Exception {
599676
GeneratedTusRuntimeBeforeStartAction resumeAction = resumeBeforeStartAction(testCase);

0 commit comments

Comments
 (0)