Skip to content
This repository was archived by the owner on Mar 14, 2025. It is now read-only.

Commit a6f2852

Browse files
overheadhunteroverheadhunter
committed
use junit5's Assertions.* instead of junit4's Assert.*
1 parent f1f7833 commit a6f2852

File tree

6 files changed

+124
-141
lines changed

6 files changed

+124
-141
lines changed

‎src/test/java/org/cryptomator/cloudaccess/webdav/ProgressRequestWrapperTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import okhttp3.MediaType;
44
import okio.Buffer;
55
import org.cryptomator.cloudaccess.api.ProgressListener;
6-
import org.junit.Assert;
6+
import org.junit.jupiter.api.Assertions;
77
import org.junit.jupiter.api.Test;
88
import org.mockito.Mockito;
99

@@ -27,13 +27,13 @@ public void updateProgressWhenWriteToProgressRequestWrapper() throws IOException
2727

2828
final var progressRequestWrapper = new ProgressRequestWrapper(InputStreamRequestBody.from(load()), spyProgressListener);
2929

30-
Assert.assertEquals(8193, progressRequestWrapper.contentLength());
31-
Assert.assertEquals(MediaType.parse("application/octet-stream"), progressRequestWrapper.contentType());
30+
Assertions.assertEquals(8193, progressRequestWrapper.contentLength());
31+
Assertions.assertEquals(MediaType.parse("application/octet-stream"), progressRequestWrapper.contentType());
3232

3333
progressRequestWrapper.writeTo(buffer);
3434
buffer.flush();
3535

36-
Assert.assertEquals(content, buffer.readString(StandardCharsets.UTF_8));
36+
Assertions.assertEquals(content, buffer.readString(StandardCharsets.UTF_8));
3737

3838
Mockito.verify(spyProgressListener).onProgress(8192);
3939
Mockito.verify(spyProgressListener).onProgress(8193);

‎src/test/java/org/cryptomator/cloudaccess/webdav/ProgressResponseWrapperTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import okhttp3.MediaType;
44
import okhttp3.ResponseBody;
55
import org.cryptomator.cloudaccess.api.ProgressListener;
6-
import org.junit.Assert;
6+
import org.junit.jupiter.api.Assertions;
77
import org.junit.jupiter.api.Test;
88
import org.mockito.Mockito;
99

@@ -26,12 +26,12 @@ public void updateProgressWhenReadFromProgressResponseWrapper() {
2626

2727
final var progressResponseWrapper = new ProgressResponseWrapper(responseBody, spyProgressListener);
2828

29-
Assert.assertEquals(8193, progressResponseWrapper.contentLength());
30-
Assert.assertEquals(MediaType.parse("application/octet-stream; charset=utf-8"), progressResponseWrapper.contentType());
29+
Assertions.assertEquals(8193, progressResponseWrapper.contentLength());
30+
Assertions.assertEquals(MediaType.parse("application/octet-stream; charset=utf-8"), progressResponseWrapper.contentType());
3131

3232
final var thatContent = new BufferedReader(new InputStreamReader(progressResponseWrapper.byteStream(), StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n"));
3333

34-
Assert.assertEquals(thatContent, thisContent);
34+
Assertions.assertEquals(thatContent, thisContent);
3535

3636
Mockito.verify(spyProgressListener).onProgress(8192);
3737
Mockito.verify(spyProgressListener).onProgress(8193);

‎src/test/java/org/cryptomator/cloudaccess/webdav/PropfindResponseParserTest.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.cryptomator.cloudaccess.api.CloudItemList;
44
import org.cryptomator.cloudaccess.api.CloudItemMetadata;
55
import org.cryptomator.cloudaccess.api.CloudItemType;
6-
import org.junit.Assert;
76
import org.junit.jupiter.api.Assertions;
87
import org.junit.jupiter.api.BeforeEach;
98
import org.junit.jupiter.api.Test;
@@ -48,8 +47,8 @@ public void testEmptyResponseLeadsToEmptyCloudNodeList() throws SAXException, IO
4847
final var propfindEntryList = propfindResponseParser.parse(load(RESPONSE_EMPTY_DIRECTORY));
4948
final var cloudNodeItemList = processDirList(propfindEntryList);
5049

51-
Assert.assertEquals(Collections.EMPTY_LIST, cloudNodeItemList.getItems());
52-
Assert.assertEquals(Optional.empty(), cloudNodeItemList.getNextPageToken());
50+
Assertions.assertEquals(Collections.EMPTY_LIST, cloudNodeItemList.getItems());
51+
Assertions.assertEquals(Optional.empty(), cloudNodeItemList.getNextPageToken());
5352
}
5453

5554
@Test
@@ -64,26 +63,26 @@ public void testFolderWithoutServerPartInHrefResponseLeadsToFolderInCloudNodeLis
6463
Optional.empty(),
6564
Optional.empty());
6665

67-
Assert.assertEquals(1, cloudNodeItemList.getItems().size());
68-
Assert.assertEquals(List.of(resultFolder), cloudNodeItemList.getItems());
66+
Assertions.assertEquals(1, cloudNodeItemList.getItems().size());
67+
Assertions.assertEquals(List.of(resultFolder), cloudNodeItemList.getItems());
6968
}
7069

7170
@Test
7271
public void testFileResponseLeadsToFileAndFoldersInCloudNodeList() throws SAXException, IOException {
7372
final var propfindEntryList = propfindResponseParser.parse(load(RESPONSE_ONE_FILE_AND_FOLDERS));
7473
final var cloudNodeItemList = processDirList(propfindEntryList);
7574

76-
Assert.assertEquals(2, cloudNodeItemList.getItems().size());
77-
Assert.assertEquals(List.of(testFile, testFolder), cloudNodeItemList.getItems());
75+
Assertions.assertEquals(2, cloudNodeItemList.getItems().size());
76+
Assertions.assertEquals(List.of(testFile, testFolder), cloudNodeItemList.getItems());
7877
}
7978

8079
@Test
8180
public void testFileWithMalFormattedDateResponseLeadsToFileAndFoldersInCloudNodeListWithoutDate() throws SAXException, IOException {
8281
final var propfindEntryList = propfindResponseParser.parse(load(RESPONSE_MAL_FORMATTED_DATE));
8382
final var cloudNodeItemList = processDirList(propfindEntryList);
8483

85-
Assert.assertEquals(2, cloudNodeItemList.getItems().size());
86-
Assert.assertEquals(List.of(new CloudItemMetadata("0.txt", Path.of("/0.txt"), CloudItemType.FILE, Optional.empty(), Optional.of(54175L)),
84+
Assertions.assertEquals(2, cloudNodeItemList.getItems().size());
85+
Assertions.assertEquals(List.of(new CloudItemMetadata("0.txt", Path.of("/0.txt"), CloudItemType.FILE, Optional.empty(), Optional.of(54175L)),
8786
new CloudItemMetadata("Gelöschte Dateien", Path.of("/Gelöschte Dateien"), CloudItemType.FOLDER, Optional.empty(), Optional.empty())),
8887
cloudNodeItemList.getItems());
8988
}
@@ -93,17 +92,17 @@ public void testFileMultiStatusLeadsToFolderInCloudNodeList() throws SAXExceptio
9392
final var propfindEntryList = propfindResponseParser.parse(load(RESPONSE_ONE_FILE_MULTI_STATUS));
9493
final var cloudNodeItemList = processDirList(propfindEntryList);
9594

96-
Assert.assertEquals(1, cloudNodeItemList.getItems().size());
97-
Assert.assertEquals(List.of(testFolder), cloudNodeItemList.getItems());
95+
Assertions.assertEquals(1, cloudNodeItemList.getItems().size());
96+
Assertions.assertEquals(List.of(testFolder), cloudNodeItemList.getItems());
9897
}
9998

10099
@Test
101100
public void testFileNoPathResponseLeadsToFileAndFoldersInCloudNodeListWithoutDate() throws SAXException, IOException {
102101
final var propfindEntryList = propfindResponseParser.parse(load(RESPONSE_MAL_FORMATTED_NO_PATH));
103102
final var cloudNodeItemList = processDirList(propfindEntryList);
104103

105-
Assert.assertEquals(0, cloudNodeItemList.getItems().size());
106-
Assert.assertEquals(Collections.EMPTY_LIST, cloudNodeItemList.getItems());
104+
Assertions.assertEquals(0, cloudNodeItemList.getItems().size());
105+
Assertions.assertEquals(Collections.EMPTY_LIST, cloudNodeItemList.getItems());
107106
}
108107

109108
private CloudItemList processDirList(final List<PropfindEntryData> entryData) {

‎src/test/java/org/cryptomator/cloudaccess/webdav/WebDavClientTest.java‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
import org.cryptomator.cloudaccess.api.CloudItemType;
1010
import org.cryptomator.cloudaccess.api.ProgressListener;
1111
import org.cryptomator.cloudaccess.api.exceptions.AlreadyExistsException;
12-
import org.junit.Assert;
1312
import org.junit.jupiter.api.Assertions;
1413
import org.junit.jupiter.api.BeforeEach;
1514
import org.junit.jupiter.api.DisplayName;
1615
import org.junit.jupiter.api.Test;
16+
import org.junit.jupiter.params.ParameterizedTest;
17+
import org.junit.jupiter.params.provider.ValueSource;
1718
import org.mockito.ArgumentMatchers;
1819
import org.mockito.Mockito;
1920

@@ -53,7 +54,7 @@ public void testItemMetadata() throws IOException {
5354

5455
final var itemMetadata = webDavClient.itemMetadata(Path.of("/Nextcloud Manual.pdf"));
5556

56-
Assert.assertEquals(testFileManual, itemMetadata);
57+
Assertions.assertEquals(testFileManual, itemMetadata);
5758
}
5859

5960
@Test
@@ -65,9 +66,9 @@ public void testList() throws IOException {
6566

6667
final var expectedList = List.of(testFolderDocuments, testFileManual, testFileIntro, testFilePng, testFolderPhotos);
6768

68-
Assert.assertEquals(expectedList, nodeList.getItems());
69+
Assertions.assertEquals(expectedList, nodeList.getItems());
6970

70-
Assert.assertTrue(nodeList.getNextPageToken().isEmpty());
71+
Assertions.assertTrue(nodeList.getNextPageToken().isEmpty());
7172
}
7273

7374
@Test
@@ -87,8 +88,8 @@ public void testListExhaustively() throws IOException {
8788

8889
final var expectedList = List.of(testFolderDocuments, testFileManual, testFileIntro, testFilePng, testFolderPhotos, testFileAbout, testFileAboutTxt, testFileFlyer, testFileCoast, testFileHummingbird, testFileCommunity, testFileNut);
8990

90-
Assert.assertEquals(expectedList, nodeList.getItems());
91-
Assert.assertTrue(nodeList.getNextPageToken().isEmpty());
91+
Assertions.assertEquals(expectedList, nodeList.getItems());
92+
Assertions.assertTrue(nodeList.getNextPageToken().isEmpty());
9293
}
9394

9495
@Test
@@ -99,7 +100,7 @@ public void testRead() throws IOException {
99100
final var inputStream = webDavClient.read(Path.of("/Documents/About.txt"), ProgressListener.NO_PROGRESS_AWARE);
100101
final var content = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n"));
101102

102-
Assert.assertEquals(load("item-read-response.txt"), content);
103+
Assertions.assertEquals(load("item-read-response.txt"), content);
103104
}
104105

105106
@Test
@@ -110,22 +111,13 @@ public void testRandomAccessRead() throws IOException {
110111
final var inputStream = webDavClient.read(Path.of("/Documents/About.txt"), 4, 2, ProgressListener.NO_PROGRESS_AWARE);
111112
final var content = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n"));
112113

113-
Assert.assertEquals(load("item-partial-read-response.txt"), content);
114+
Assertions.assertEquals(load("item-partial-read-response.txt"), content);
114115
}
115116

116-
@Test
117117
@DisplayName("write to /foo.txt (non-existing)")
118-
public void testWriteToNewFile() throws IOException {
119-
testWriteToNewFile(true);
120-
}
121-
122-
@Test
123-
@DisplayName("write to /foo.txt (non-existing)")
124-
public void testWriteToNewFileReplaceIsFalse() throws IOException {
125-
testWriteToNewFile(false);
126-
}
127-
128-
private void testWriteToNewFile(boolean replace) throws IOException {
118+
@ParameterizedTest(name = "replace: {0}")
119+
@ValueSource(booleans = {true, false})
120+
public void testWriteToNewFile(boolean replace) throws IOException {
129121
Mockito.when(webDavCompatibleHttpClient.execute(ArgumentMatchers.any()))
130122
.thenReturn(getInterceptedResponse(baseUrl))
131123
.thenReturn(getInterceptedResponse(baseUrl, "item-write-response.xml"));
@@ -135,7 +127,7 @@ private void testWriteToNewFile(boolean replace) throws IOException {
135127
InputStream inputStream = getClass().getResourceAsStream("/progress-request-text.txt");
136128
final var cloudItemMetadata = webDavClient.write(Path.of("/foo.txt"), replace, inputStream, ProgressListener.NO_PROGRESS_AWARE);
137129

138-
Assert.assertEquals(writtenItemMetadata, cloudItemMetadata);
130+
Assertions.assertEquals(writtenItemMetadata, cloudItemMetadata);
139131
}
140132

141133
@Test
@@ -148,7 +140,7 @@ public void testWriteToExistingFile() throws IOException {
148140

149141
Assertions.assertThrows(AlreadyExistsException.class, () -> {
150142
final var cloudItemMetadataUsingReplaceFalse = webDavClient.write(Path.of("/foo.txt"), false, inputStream, ProgressListener.NO_PROGRESS_AWARE);
151-
Assert.assertNull(cloudItemMetadataUsingReplaceFalse);
143+
Assertions.assertNull(cloudItemMetadataUsingReplaceFalse);
152144
});
153145
}
154146

@@ -164,7 +156,7 @@ public void testWriteToAndReplaceExistingFile() throws IOException {
164156
InputStream inputStream = getClass().getResourceAsStream("/progress-request-text.txt");
165157
final var cloudItemMetadata = webDavClient.write(Path.of("/foo.txt"), true, inputStream, ProgressListener.NO_PROGRESS_AWARE);
166158

167-
Assert.assertEquals(writtenItemMetadata, cloudItemMetadata);
159+
Assertions.assertEquals(writtenItemMetadata, cloudItemMetadata);
168160
}
169161

170162
@Test
@@ -175,7 +167,7 @@ public void testCreateFolder() throws IOException {
175167

176168
final var path = webDavClient.createFolder(Path.of("/foo"));
177169

178-
Assert.assertEquals(Path.of("/foo"), path);
170+
Assertions.assertEquals(Path.of("/foo"), path);
179171
}
180172

181173
@Test
@@ -204,7 +196,7 @@ public void testMoveToNonExisting() throws IOException {
204196

205197
final var targetPath = webDavClient.move(Path.of("/foo"), Path.of("/bar"), false);
206198

207-
Assert.assertEquals(Path.of("/bar"), targetPath);
199+
Assertions.assertEquals(Path.of("/bar"), targetPath);
208200
}
209201

210202
@Test
@@ -215,7 +207,7 @@ public void testMoveToExisting() throws IOException {
215207

216208
Assertions.assertThrows(AlreadyExistsException.class, () -> {
217209
final var targetPath = webDavClient.move(Path.of("/foo"), Path.of("/bar"), false);
218-
Assert.assertNull(targetPath);
210+
Assertions.assertNull(targetPath);
219211
});
220212
}
221213

@@ -227,7 +219,7 @@ public void testMoveToAndReplaceExisting() throws IOException {
227219

228220
final var targetPath = webDavClient.move(Path.of("/foo"), Path.of("/bar"), true);
229221

230-
Assert.assertEquals(Path.of("/bar"), targetPath);
222+
Assertions.assertEquals(Path.of("/bar"), targetPath);
231223
}
232224

233225
@Test

0 commit comments

Comments
 (0)