Skip to content

Commit bc58e63

Browse files
tomdesairtomdesair
committed
Improve unit tests
1 parent 48e271c commit bc58e63

12 files changed

+136
-29
lines changed

‎src/test/java/me/desair/tus/server/checksum/ChecksumPatchRequestHandlerTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.mockito.Matchers.any;
56
import static org.mockito.Matchers.anyString;
7+
import static org.mockito.Mockito.never;
8+
import static org.mockito.Mockito.times;
9+
import static org.mockito.Mockito.verify;
610
import static org.mockito.Mockito.when;
711

812
import me.desair.tus.server.HttpHeader;
@@ -59,6 +63,8 @@ public void testValidHeaderAndChecksum() throws Exception {
5963
when(servletRequest.hasCalculatedChecksum()).thenReturn(true);
6064

6165
handler.process(HttpMethod.PATCH, servletRequest, null, uploadStorageService, null);
66+
67+
verify(servletRequest, times(1)).getCalculatedChecksum(any(ChecksumAlgorithm.class));
6268
}
6369

6470
@Test(expected = UploadChecksumMismatchException.class)
@@ -75,6 +81,8 @@ public void testNoHeader() throws Exception {
7581
when(servletRequest.getHeader(HttpHeader.UPLOAD_CHECKSUM)).thenReturn(null);
7682

7783
handler.process(HttpMethod.PATCH, servletRequest, null, uploadStorageService, null);
84+
85+
verify(servletRequest, never()).getCalculatedChecksum(any(ChecksumAlgorithm.class));
7886
}
7987

8088
@Test(expected = ChecksumAlgorithmNotSupportedException.class)

‎src/test/java/me/desair/tus/server/checksum/ITChecksumExtension.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package me.desair.tus.server.checksum;
22

3+
import static org.junit.Assert.fail;
4+
35
import me.desair.tus.server.AbstractTusExtensionIntegrationTest;
46
import me.desair.tus.server.HttpHeader;
57
import me.desair.tus.server.HttpMethod;
@@ -53,7 +55,11 @@ public void testValidChecksumTrailerHeader() throws Exception {
5355
servletRequest.addHeader(HttpHeader.TRANSFER_ENCODING, "chunked");
5456
servletRequest.setContent(content.getBytes());
5557

56-
executeCall(HttpMethod.PATCH, true);
58+
try {
59+
executeCall(HttpMethod.PATCH, true);
60+
} catch (Exception ex) {
61+
fail();
62+
}
5763
}
5864

5965
@Test
@@ -100,6 +106,10 @@ public void testNoChecksum() throws Exception {
100106

101107
servletRequest.setContent(content.getBytes());
102108

103-
executeCall(HttpMethod.PATCH, true);
109+
try {
110+
executeCall(HttpMethod.PATCH, true);
111+
} catch (Exception ex) {
112+
fail();
113+
}
104114
}
105115
}

‎src/test/java/me/desair/tus/server/checksum/validation/ChecksumAlgorithmValidatorTest.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.junit.Assert.fail;
6+
import static org.mockito.Mockito.spy;
7+
import static org.mockito.Mockito.times;
8+
import static org.mockito.Mockito.verify;
59

610
import me.desair.tus.server.HttpHeader;
711
import me.desair.tus.server.HttpMethod;
@@ -26,7 +30,7 @@ public class ChecksumAlgorithmValidatorTest {
2630

2731
@Before
2832
public void setUp() {
29-
servletRequest = new MockHttpServletRequest();
33+
servletRequest = spy(new MockHttpServletRequest());
3034
validator = new ChecksumAlgorithmValidator();
3135
}
3236

@@ -47,13 +51,19 @@ public void testValid() throws Exception {
4751
servletRequest.addHeader(HttpHeader.UPLOAD_CHECKSUM, "sha1 1234567890");
4852

4953
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
54+
55+
verify(servletRequest, times(1)).getHeader(HttpHeader.UPLOAD_CHECKSUM);
5056
}
5157

5258
@Test
5359
public void testNoHeader() throws Exception {
5460
//servletRequest.addHeader(HttpHeader.UPLOAD_CHECKSUM, null);
5561

56-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
62+
try {
63+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
64+
} catch (Exception ex) {
65+
fail();
66+
}
5767
}
5868

5969
@Test(expected = ChecksumAlgorithmNotSupportedException.class)

‎src/test/java/me/desair/tus/server/concatenation/validation/NoUploadLengthOnFinalValidatorTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.junit.Assert.fail;
56

67
import me.desair.tus.server.HttpHeader;
78
import me.desair.tus.server.HttpMethod;
@@ -40,7 +41,11 @@ public void validateFinalUploadValid() throws Exception {
4041
//servletRequest.addHeader(HttpHeader.UPLOAD_LENGTH, "10L");
4142

4243
//When we validate the request
43-
validator.validate(HttpMethod.POST, servletRequest, null, null);
44+
try {
45+
validator.validate(HttpMethod.POST, servletRequest, null, null);
46+
} catch (Exception ex) {
47+
fail();
48+
}
4449

4550
//No Exception is thrown
4651
}

‎src/test/java/me/desair/tus/server/concatenation/validation/PatchFinalUploadValidatorTest.java‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.hamcrest.MatcherAssert.assertThat;
44
import static org.hamcrest.Matchers.is;
5+
import static org.junit.Assert.fail;
56
import static org.mockito.Matchers.anyString;
67
import static org.mockito.Matchers.eq;
78
import static org.mockito.Mockito.when;
@@ -66,22 +67,32 @@ public void testValid() throws Exception {
6667
when(uploadStorageService.getUploadInfo(eq(info2.getId().toString()), anyString())).thenReturn(info2);
6768
when(uploadStorageService.getUploadInfo(eq(info3.getId().toString()), anyString())).thenReturn(info3);
6869

69-
//When we validate the request
70-
servletRequest.setRequestURI(info1.getId().toString());
71-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
70+
//When we validate the requests
71+
try {
72+
servletRequest.setRequestURI(info1.getId().toString());
73+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
7274

73-
servletRequest.setRequestURI(info2.getId().toString());
74-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
75+
servletRequest.setRequestURI(info2.getId().toString());
76+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
7577

76-
servletRequest.setRequestURI(info3.getId().toString());
77-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
78+
servletRequest.setRequestURI(info3.getId().toString());
79+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
80+
} catch (Exception ex) {
81+
fail();
82+
}
83+
84+
//No exception is thrown
7885
}
7986

8087
@Test
8188
public void testValidNotFound() throws Exception {
82-
//When we validate the request
83-
servletRequest.setRequestURI("/upload/test");
84-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
89+
try {
90+
//When we validate the request
91+
servletRequest.setRequestURI("/upload/test");
92+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
93+
} catch (Exception ex) {
94+
fail();
95+
}
8596
}
8697

8798
@Test(expected = PatchOnFinalUploadNotAllowedException.class)

‎src/test/java/me/desair/tus/server/core/validation/ContentLengthValidatorTest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.junit.Assert.fail;
56
import static org.mockito.Matchers.anyString;
67
import static org.mockito.Mockito.when;
78

@@ -58,7 +59,11 @@ public void validateValidLengthInProgressUpload() throws Exception {
5859
servletRequest.addHeader(HttpHeader.CONTENT_LENGTH, 5L);
5960

6061
//When we validate the request
61-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
62+
try {
63+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
64+
} catch (Exception ex) {
65+
fail();
66+
}
6267

6368
//No Exception is thrown
6469
}
@@ -73,7 +78,11 @@ public void validateValidLengthPartialUpload() throws Exception {
7378
servletRequest.addHeader(HttpHeader.CONTENT_LENGTH, 3L);
7479

7580
//When we validate the request
76-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
81+
try {
82+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
83+
} catch (Exception ex) {
84+
fail();
85+
}
7786

7887
//No Exception is thrown
7988
}

‎src/test/java/me/desair/tus/server/core/validation/IdExistsValidatorTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.junit.Assert.fail;
56
import static org.mockito.Matchers.anyString;
67
import static org.mockito.Mockito.when;
78

@@ -40,7 +41,11 @@ public void validateValid() throws Exception {
4041
when(uploadStorageService.getUploadInfo(anyString(), anyString())).thenReturn(info);
4142

4243
//When we validate the request
43-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
44+
try {
45+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
46+
} catch (Exception ex) {
47+
fail();
48+
}
4449

4550
//No Exception is thrown
4651
}

‎src/test/java/me/desair/tus/server/core/validation/TusResumableValidatorTest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.junit.Assert.fail;
56

67
import me.desair.tus.server.HttpHeader;
78
import me.desair.tus.server.HttpMethod;
@@ -37,13 +38,21 @@ public void validateInvalidVersion() throws Exception {
3738
@Test
3839
public void validateValid() throws Exception {
3940
servletRequest.addHeader(HttpHeader.TUS_RESUMABLE, "1.0.0");
40-
validator.validate(HttpMethod.POST, servletRequest, uploadStorageService, null);
41+
try {
42+
validator.validate(HttpMethod.POST, servletRequest, uploadStorageService, null);
43+
} catch (Exception ex) {
44+
fail();
45+
}
4146
}
4247

4348
@Test
4449
public void validateNullMethod() throws Exception {
4550
servletRequest.addHeader(HttpHeader.TUS_RESUMABLE, "1.0.0");
46-
validator.validate(null, servletRequest, uploadStorageService, null);
51+
try {
52+
validator.validate(null, servletRequest, uploadStorageService, null);
53+
} catch (Exception ex) {
54+
fail();
55+
}
4756
}
4857

4958
@Test

‎src/test/java/me/desair/tus/server/core/validation/UploadOffsetValidatorTest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.junit.Assert.fail;
56
import static org.mockito.Matchers.anyString;
67
import static org.mockito.Mockito.when;
78

@@ -58,7 +59,11 @@ public void validateValidOffsetInProgressUpload() throws Exception {
5859
servletRequest.addHeader(HttpHeader.UPLOAD_OFFSET, 5L);
5960

6061
//When we validate the request
61-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
62+
try {
63+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
64+
} catch (Exception ex) {
65+
fail();
66+
}
6267

6368
//No Exception is thrown
6469
}
@@ -116,7 +121,11 @@ public void validateMissingUploadInfo() throws Exception {
116121
servletRequest.addHeader(HttpHeader.UPLOAD_OFFSET, 3L);
117122

118123
//When we validate the request
119-
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
124+
try {
125+
validator.validate(HttpMethod.PATCH, servletRequest, uploadStorageService, null);
126+
} catch (Exception ex) {
127+
fail();
128+
}
120129

121130
//No Exception is thrown
122131
}

‎src/test/java/me/desair/tus/server/creation/validation/PostEmptyRequestValidatorTest.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.junit.Assert.fail;
56

67
import me.desair.tus.server.HttpHeader;
78
import me.desair.tus.server.HttpMethod;
@@ -50,7 +51,11 @@ public void validateContentLengthZero() throws Exception {
5051
servletRequest.addHeader(HttpHeader.CONTENT_LENGTH, 0L);
5152

5253
//When we validate the request
53-
validator.validate(HttpMethod.POST, servletRequest, null, null);
54+
try {
55+
validator.validate(HttpMethod.POST, servletRequest, null, null);
56+
} catch (Exception ex) {
57+
fail();
58+
}
5459

5560
//No Exception is thrown
5661
}

0 commit comments

Comments
 (0)