Skip to content

Commit 1dcfc3c

Browse files
committed
Update managed upload attempt fixture
1 parent 1e511dc commit 1dcfc3c

1 file changed

Lines changed: 36 additions & 15 deletions

File tree

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

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ public class TestGeneratedTusManagedUploadRuntime extends MockServerProvider {
100100
0,
101101
"failed",
102102
new GeneratedTusManagedUploadFailure(
103-
"after-accepted-offset",
103+
true,
104+
false,
105+
false,
104106
"io-error",
105107
7
106108
),
@@ -282,7 +284,9 @@ public class TestGeneratedTusManagedUploadRuntime extends MockServerProvider {
282284
0,
283285
"failed",
284286
new GeneratedTusManagedUploadFailure(
285-
"during-protocol-request",
287+
false,
288+
false,
289+
true,
286290
"unretryable-protocol-error",
287291
-1
288292
),
@@ -380,7 +384,9 @@ public class TestGeneratedTusManagedUploadRuntime extends MockServerProvider {
380384
0,
381385
"failed",
382386
new GeneratedTusManagedUploadFailure(
383-
"during-protocol-request",
387+
false,
388+
false,
389+
true,
384390
"retryable-protocol-error",
385391
-1
386392
),
@@ -414,7 +420,9 @@ public class TestGeneratedTusManagedUploadRuntime extends MockServerProvider {
414420
1,
415421
"failed",
416422
new GeneratedTusManagedUploadFailure(
417-
"during-protocol-request",
423+
false,
424+
false,
425+
true,
418426
"retryable-protocol-error",
419427
-1
420428
),
@@ -448,7 +456,9 @@ public class TestGeneratedTusManagedUploadRuntime extends MockServerProvider {
448456
2,
449457
"failed",
450458
new GeneratedTusManagedUploadFailure(
451-
"during-protocol-request",
459+
false,
460+
false,
461+
true,
452462
"retryable-protocol-error",
453463
-1
454464
),
@@ -539,7 +549,9 @@ public class TestGeneratedTusManagedUploadRuntime extends MockServerProvider {
539549
0,
540550
"failed",
541551
new GeneratedTusManagedUploadFailure(
542-
"before-protocol-request",
552+
false,
553+
true,
554+
false,
543555
"source-unavailable",
544556
-1
545557
),
@@ -702,7 +714,7 @@ protected void makeAttempt() throws ProtocolException, IOException {
702714
&& uploader.getOffset() == attempt.failure.afterAcceptedOffset) {
703715
uploader.finish(false);
704716
recordState(testCase, states, stateFile, attempt.stateAfterAttempt);
705-
throw new IOException(attempt.failure.kind);
717+
throw new IOException(attempt.failure.failureMessage);
706718
}
707719
}
708720
uploader.finish();
@@ -722,15 +734,15 @@ protected void makeAttempt() throws ProtocolException, IOException {
722734

723735
private boolean isAfterAcceptedOffsetFailure(GeneratedTusManagedUploadAttempt attempt) {
724736
return attempt.failure != null
725-
&& "after-accepted-offset".equals(attempt.failure.phase);
737+
&& attempt.failure.failAfterAcceptedOffset;
726738
}
727739

728740
private void recordDuringProtocolFailure(
729741
GeneratedTusManagedUploadRuntimeCase testCase,
730742
List<String> states,
731743
File stateFile,
732744
GeneratedTusManagedUploadAttempt attempt) throws IOException {
733-
if (attempt.failure == null || !"during-protocol-request".equals(attempt.failure.phase)) {
745+
if (attempt.failure == null || !attempt.failure.failDuringProtocolRequest) {
734746
return;
735747
}
736748

@@ -1212,14 +1224,23 @@ private static final class GeneratedTusManagedUploadAttempt {
12121224
}
12131225

12141226
private static final class GeneratedTusManagedUploadFailure {
1215-
final String phase;
1216-
final String kind;
12171227
final long afterAcceptedOffset;
1218-
1219-
GeneratedTusManagedUploadFailure(String phase, String kind, long afterAcceptedOffset) {
1220-
this.phase = phase;
1221-
this.kind = kind;
1228+
final boolean failAfterAcceptedOffset;
1229+
final boolean failBeforeProtocolRequest;
1230+
final boolean failDuringProtocolRequest;
1231+
final String failureMessage;
1232+
1233+
GeneratedTusManagedUploadFailure(
1234+
boolean failAfterAcceptedOffset,
1235+
boolean failBeforeProtocolRequest,
1236+
boolean failDuringProtocolRequest,
1237+
String failureMessage,
1238+
long afterAcceptedOffset) {
12221239
this.afterAcceptedOffset = afterAcceptedOffset;
1240+
this.failAfterAcceptedOffset = failAfterAcceptedOffset;
1241+
this.failBeforeProtocolRequest = failBeforeProtocolRequest;
1242+
this.failDuringProtocolRequest = failDuringProtocolRequest;
1243+
this.failureMessage = failureMessage;
12231244
}
12241245
}
12251246

0 commit comments

Comments
 (0)