Skip to content

Commit ffb7829

Browse files
kvzkvz
committed
Use generic TUS extra event matching policy
1 parent 7de7186 commit ffb7829

3 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎src/test/java/io/tus/java/client/GeneratedTusClientConformanceScenarios.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ final class GeneratedTusClientConformanceScenarios {
3434
},
3535
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
3636
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
37-
"exact-except-extra-progress",
37+
"exact-except-allowed-extra-events",
3838
null,
3939
"milestone",
4040
"may-emit-extra-samples"
@@ -81,7 +81,7 @@ final class GeneratedTusClientConformanceScenarios {
8181
},
8282
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
8383
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
84-
"exact-except-extra-progress",
84+
"exact-except-allowed-extra-events",
8585
null,
8686
"milestone",
8787
"may-emit-extra-samples"
@@ -123,7 +123,7 @@ final class GeneratedTusClientConformanceScenarios {
123123
},
124124
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
125125
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
126-
"exact-except-extra-progress",
126+
"exact-except-allowed-extra-events",
127127
null,
128128
"milestone",
129129
"may-emit-extra-samples"
@@ -177,7 +177,7 @@ final class GeneratedTusClientConformanceScenarios {
177177
},
178178
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
179179
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
180-
"exact-except-extra-progress",
180+
"exact-except-allowed-extra-events",
181181
null,
182182
"milestone",
183183
"may-emit-extra-samples"
@@ -218,7 +218,7 @@ final class GeneratedTusClientConformanceScenarios {
218218
},
219219
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
220220
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
221-
"exact-except-extra-progress",
221+
"exact-except-allowed-extra-events",
222222
null,
223223
"milestone",
224224
"may-emit-extra-samples"
@@ -273,7 +273,7 @@ final class GeneratedTusClientConformanceScenarios {
273273
},
274274
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
275275
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
276-
"exact-except-extra-progress",
276+
"exact-except-allowed-extra-events",
277277
null,
278278
"milestone",
279279
"may-emit-extra-samples"
@@ -692,7 +692,7 @@ final class GeneratedTusClientConformanceScenarios {
692692
},
693693
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
694694
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
695-
"exact-except-extra-progress",
695+
"exact-except-allowed-extra-events",
696696
null,
697697
"milestone",
698698
"may-emit-extra-samples"
@@ -743,7 +743,7 @@ final class GeneratedTusClientConformanceScenarios {
743743
},
744744
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
745745
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
746-
"exact-except-extra-progress",
746+
"exact-except-allowed-extra-events",
747747
null,
748748
"milestone",
749749
"may-emit-extra-samples"
@@ -962,7 +962,7 @@ final class GeneratedTusClientConformanceScenarios {
962962
},
963963
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
964964
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
965-
"exact-except-extra-progress",
965+
"exact-except-allowed-extra-events",
966966
"allow-known-total-before-declaration",
967967
"milestone",
968968
"may-emit-extra-samples"
@@ -1007,7 +1007,7 @@ final class GeneratedTusClientConformanceScenarios {
10071007
},
10081008
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
10091009
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
1010-
"exact-except-extra-progress",
1010+
"exact-except-allowed-extra-events",
10111011
"allow-known-total-before-declaration",
10121012
"milestone",
10131013
"may-emit-extra-samples"
@@ -1105,7 +1105,7 @@ final class GeneratedTusClientConformanceScenarios {
11051105
},
11061106
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEvents(
11071107
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
1108-
"exact-except-extra-progress",
1108+
"exact-except-allowed-extra-events",
11091109
null,
11101110
"milestone",
11111111
"may-emit-extra-samples"

‎src/test/java/io/tus/java/client/TestGeneratedTusConformanceEvents.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class TestGeneratedTusConformanceEvents {
2121
"singleUploadLifecycle",
2222
"singleUploadLifecycle",
2323
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
24-
"exact-except-extra-progress",
24+
"exact-except-allowed-extra-events",
2525
null,
2626
"milestone",
2727
"may-emit-extra-samples"
@@ -54,7 +54,7 @@ public class TestGeneratedTusConformanceEvents {
5454
"creationWithUpload",
5555
"creationWithUpload",
5656
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
57-
"exact-except-extra-progress",
57+
"exact-except-allowed-extra-events",
5858
null,
5959
"milestone",
6060
"may-emit-extra-samples"
@@ -81,7 +81,7 @@ public class TestGeneratedTusConformanceEvents {
8181
"creationWithUpload",
8282
"creationWithUploadPartialChunk",
8383
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
84-
"exact-except-extra-progress",
84+
"exact-except-allowed-extra-events",
8585
null,
8686
"milestone",
8787
"may-emit-extra-samples"
@@ -122,7 +122,7 @@ public class TestGeneratedTusConformanceEvents {
122122
"protocolVersionSelection",
123123
"ietfDraft05CreationWithUpload",
124124
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
125-
"exact-except-extra-progress",
125+
"exact-except-allowed-extra-events",
126126
null,
127127
"milestone",
128128
"may-emit-extra-samples"
@@ -149,7 +149,7 @@ public class TestGeneratedTusConformanceEvents {
149149
"protocolVersionSelection",
150150
"ietfDraft05ChunkedUploadComplete",
151151
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
152-
"exact-except-extra-progress",
152+
"exact-except-allowed-extra-events",
153153
null,
154154
"milestone",
155155
"may-emit-extra-samples"
@@ -190,7 +190,7 @@ public class TestGeneratedTusConformanceEvents {
190190
"protocolVersionSelection",
191191
"ietfDraft03ResumeWithoutKnownLength",
192192
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
193-
"exact-except-extra-progress",
193+
"exact-except-allowed-extra-events",
194194
null,
195195
"milestone",
196196
"may-emit-extra-samples"
@@ -219,7 +219,7 @@ public class TestGeneratedTusConformanceEvents {
219219
"resumeUpload",
220220
"resumeFromPreviousUpload",
221221
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
222-
"exact-except-extra-progress",
222+
"exact-except-allowed-extra-events",
223223
null,
224224
"milestone",
225225
"may-emit-extra-samples"
@@ -256,7 +256,7 @@ public class TestGeneratedTusConformanceEvents {
256256
"relativeLocationResolution",
257257
"relativeLocationResolution",
258258
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
259-
"exact-except-extra-progress",
259+
"exact-except-allowed-extra-events",
260260
null,
261261
"milestone",
262262
"may-emit-extra-samples"
@@ -390,7 +390,7 @@ public class TestGeneratedTusConformanceEvents {
390390
"deferredLengthUpload",
391391
"deferredLengthUpload",
392392
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
393-
"exact-except-extra-progress",
393+
"exact-except-allowed-extra-events",
394394
"allow-known-total-before-declaration",
395395
"milestone",
396396
"may-emit-extra-samples"
@@ -419,7 +419,7 @@ public class TestGeneratedTusConformanceEvents {
419419
"deferredLengthUpload",
420420
"deferredLengthChunkedUpload",
421421
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
422-
"exact-except-extra-progress",
422+
"exact-except-allowed-extra-events",
423423
"allow-known-total-before-declaration",
424424
"milestone",
425425
"may-emit-extra-samples"
@@ -472,7 +472,7 @@ public class TestGeneratedTusConformanceEvents {
472472
"parallelUploadConcat",
473473
"parallelUploadConcat",
474474
new GeneratedTusProtocolContract.GeneratedTusClientConformanceEventPolicy(
475-
"exact-except-extra-progress",
475+
"exact-except-allowed-extra-events",
476476
null,
477477
"milestone",
478478
"may-emit-extra-samples"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class TestGeneratedTusRuntimeEvents extends MockServerProvider {
3232
"singleUploadLifecycle",
3333
new GeneratedTusRuntimeEventExpectations(
3434
new GeneratedTusRuntimeEventPolicy(
35-
"exact-except-extra-progress"
35+
"exact-except-allowed-extra-events"
3636
),
3737
new String[] {
3838
"progress:0:11",
@@ -117,7 +117,7 @@ public class TestGeneratedTusRuntimeEvents extends MockServerProvider {
117117
"resumeFromPreviousUpload",
118118
new GeneratedTusRuntimeEventExpectations(
119119
new GeneratedTusRuntimeEventPolicy(
120-
"exact-except-extra-progress"
120+
"exact-except-allowed-extra-events"
121121
),
122122
new String[] {
123123
"progress:5:11",
@@ -201,7 +201,7 @@ public class TestGeneratedTusRuntimeEvents extends MockServerProvider {
201201
"relativeLocationResolution",
202202
new GeneratedTusRuntimeEventExpectations(
203203
new GeneratedTusRuntimeEventPolicy(
204-
"exact-except-extra-progress"
204+
"exact-except-allowed-extra-events"
205205
),
206206
new String[] {
207207
"progress:0:11",
@@ -286,7 +286,7 @@ public class TestGeneratedTusRuntimeEvents extends MockServerProvider {
286286
"deferredLengthUpload",
287287
new GeneratedTusRuntimeEventExpectations(
288288
new GeneratedTusRuntimeEventPolicy(
289-
"exact-except-extra-progress"
289+
"exact-except-allowed-extra-events"
290290
),
291291
new String[] {
292292
"progress:0:11",
@@ -375,7 +375,7 @@ public class TestGeneratedTusRuntimeEvents extends MockServerProvider {
375375
"deferredLengthChunkedUpload",
376376
new GeneratedTusRuntimeEventExpectations(
377377
new GeneratedTusRuntimeEventPolicy(
378-
"exact-except-extra-progress"
378+
"exact-except-allowed-extra-events"
379379
),
380380
new String[] {
381381
"progress:0:null",
@@ -879,8 +879,8 @@ private void assertEvents(GeneratedTusRuntimeEventCase testCase, List<String> ev
879879
return;
880880
}
881881

882-
if ("exact-except-extra-progress".equals(testCase.eventExpectations.policy.matching)) {
883-
assertEventsExactExceptExtraProgress(testCase, events);
882+
if ("exact-except-allowed-extra-events".equals(testCase.eventExpectations.policy.matching)) {
883+
assertEventsExactExceptAllowedExtraEvents(testCase, events);
884884
return;
885885
}
886886

@@ -891,7 +891,7 @@ private void assertEvents(GeneratedTusRuntimeEventCase testCase, List<String> ev
891891
+ testCase.scenarioId);
892892
}
893893

894-
private void assertEventsExactExceptExtraProgress(
894+
private void assertEventsExactExceptAllowedExtraEvents(
895895
GeneratedTusRuntimeEventCase testCase,
896896
List<String> events) {
897897
int expectedIndex = 0;
@@ -909,7 +909,7 @@ && eventMatchesExpected(testCase, event, expectedIndex)) {
909909

910910
throw new AssertionError(
911911
testCase.scenarioId
912-
+ " emitted unexpected non-progress event "
912+
+ " emitted unexpected non-allowed extra event "
913913
+ event
914914
+ "; expected "
915915
+ java.util.Arrays.toString(testCase.eventExpectations.keys));

0 commit comments

Comments
 (0)