Fix server responses in WebDAV write tests

Author: SailReal

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

@@ -13,8 +13,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 
@@ -114,18 +112,32 @@ public void testRandomAccessRead() throws IOException {
         Assertions.assertEquals(load("item-partial-read-response.txt"), content);
     }
 
-    @DisplayName("write to /foo.txt (non-existing)")
-    @ParameterizedTest(name = "replace: {0}")
-    @ValueSource(booleans = {true, false})
-    public void testWriteToNewFile(boolean replace) throws IOException {
+    @Test
+    @DisplayName("write to /foo.txt (non-existing, replace)")
+    public void testWriteToAndReplaceNewFile() throws IOException {
         Mockito.when(webDavCompatibleHttpClient.execute(ArgumentMatchers.any()))
                 .thenReturn(getInterceptedResponse(baseUrl))
                 .thenReturn(getInterceptedResponse(baseUrl, "item-write-response.xml"));
 
         final var writtenItemMetadata = new CloudItemMetadata("foo.txt", Path.of("/cloud/remote.php/webdav/foo.txt"), CloudItemType.FILE, Optional.of(TestUtil.toInstant("Thu, 07 Jul 2020 16:55:50 GMT")), Optional.of(8193L));
 
         InputStream inputStream = getClass().getResourceAsStream("/progress-request-text.txt");
-        final var cloudItemMetadata = webDavClient.write(Path.of("/foo.txt"), replace, inputStream, ProgressListener.NO_PROGRESS_AWARE);
+        final var cloudItemMetadata = webDavClient.write(Path.of("/foo.txt"), true, inputStream, ProgressListener.NO_PROGRESS_AWARE);
+
+        Assertions.assertEquals(writtenItemMetadata, cloudItemMetadata);
+    }
+
+    @Test
+    @DisplayName("write to /foo.txt (non-existing)")
+    public void testWriteToNewFile() throws IOException {
+        Mockito.when(webDavCompatibleHttpClient.execute(ArgumentMatchers.any()))
+                .thenReturn(getInterceptedResponse(baseUrl, 404, ""))
+                .thenReturn(getInterceptedResponse(baseUrl, "item-write-response.xml"));
+
+        final var writtenItemMetadata = new CloudItemMetadata("foo.txt", Path.of("/cloud/remote.php/webdav/foo.txt"), CloudItemType.FILE, Optional.of(TestUtil.toInstant("Thu, 07 Jul 2020 16:55:50 GMT")), Optional.of(8193L));
+
+        InputStream inputStream = getClass().getResourceAsStream("/progress-request-text.txt");
+        final var cloudItemMetadata = webDavClient.write(Path.of("/foo.txt"), false, inputStream, ProgressListener.NO_PROGRESS_AWARE);
 
         Assertions.assertEquals(writtenItemMetadata, cloudItemMetadata);
     }

src/test/java/org/cryptomator/cloudaccess/webdav/WebDavCloudProviderTestIT.java

@@ -13,8 +13,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -153,19 +151,17 @@ public void testRandomAccessRead() throws InterruptedException {
         Assertions.assertEquals("/cloud/remote.php/webdav/Documents/About.txt", rq.getPath());
     }
 
-
+    @Test
     @DisplayName("write to /foo.txt (non-existing)")
-    @ParameterizedTest(name = "replace = {0}")
-    @ValueSource(booleans = {true, false})
-    public void testWriteToNewFile(boolean replace) throws InterruptedException {
-        server.enqueue(getInterceptedResponse(201, ""));
+    public void testWriteToNewFile() throws InterruptedException {
+        server.enqueue(getInterceptedResponse(404, ""));
         server.enqueue(getInterceptedResponse(201, ""));
         server.enqueue(getInterceptedResponse("item-write-response.xml"));
 
         final var writtenItemMetadata = new CloudItemMetadata("foo.txt", Path.of("/cloud/remote.php/webdav/foo.txt"), CloudItemType.FILE, Optional.of(TestUtil.toInstant("Thu, 07 Jul 2020 16:55:50 GMT")), Optional.of(8193L));
 
         final var inputStream = getClass().getResourceAsStream("/progress-request-text.txt");
-        final var cloudItemMetadata = provider.write(Path.of("/foo.txt"), replace, inputStream, ProgressListener.NO_PROGRESS_AWARE).toCompletableFuture().join();
+        final var cloudItemMetadata = provider.write(Path.of("/foo.txt"), false, inputStream, ProgressListener.NO_PROGRESS_AWARE).toCompletableFuture().join();
 
         Assertions.assertEquals(writtenItemMetadata, cloudItemMetadata);
         RecordedRequest rq = server.takeRequest();
@@ -185,6 +181,30 @@ public void testWriteToNewFile(boolean replace) throws InterruptedException {
         Assertions.assertEquals(webDavRequestBody, rq.getBody().readUtf8());
     }
 
+    @Test
+    @DisplayName("write to /foo.txt (non-existing, replace)")
+    public void testWriteToAndReplaceNewFile() throws InterruptedException {
+        server.enqueue(getInterceptedResponse(201, ""));
+        server.enqueue(getInterceptedResponse("item-write-response.xml"));
+
+        final var writtenItemMetadata = new CloudItemMetadata("foo.txt", Path.of("/cloud/remote.php/webdav/foo.txt"), CloudItemType.FILE, Optional.of(TestUtil.toInstant("Thu, 07 Jul 2020 16:55:50 GMT")), Optional.of(8193L));
+
+        final var inputStream = getClass().getResourceAsStream("/progress-request-text.txt");
+        final var cloudItemMetadata = provider.write(Path.of("/foo.txt"), true, inputStream, ProgressListener.NO_PROGRESS_AWARE).toCompletableFuture().join();
+
+        Assertions.assertEquals(writtenItemMetadata, cloudItemMetadata);
+
+        RecordedRequest rq = server.takeRequest();
+        Assertions.assertEquals("PUT", rq.getMethod());
+        Assertions.assertEquals("/cloud/remote.php/webdav/foo.txt", rq.getPath());
+
+        rq = server.takeRequest();
+        Assertions.assertEquals("PROPFIND", rq.getMethod());
+        Assertions.assertEquals("0", rq.getHeader("DEPTH"));
+        Assertions.assertEquals("/cloud/remote.php/webdav/foo.txt", rq.getPath());
+        Assertions.assertEquals(webDavRequestBody, rq.getBody().readUtf8());
+    }
+
     @Test
     @DisplayName("write to /file (already existing)")
     public void testWriteToExistingFile() throws InterruptedException {
@@ -209,7 +229,6 @@ public void testWriteToExistingFile() throws InterruptedException {
     @DisplayName("write to /foo.txt (replace existing)")
     public void testWriteToAndReplaceExistingFile() throws InterruptedException {
         server.enqueue(getInterceptedResponse("item-write-response.xml"));
-        server.enqueue(getInterceptedResponse(200, ""));
         server.enqueue(getInterceptedResponse("item-write-response.xml"));
 
         final var writtenItemMetadata = new CloudItemMetadata("foo.txt", Path.of("/cloud/remote.php/webdav/foo.txt"), CloudItemType.FILE, Optional.of(TestUtil.toInstant("Thu, 07 Jul 2020 16:55:50 GMT")), Optional.of(8193L));
@@ -220,12 +239,6 @@ public void testWriteToAndReplaceExistingFile() throws InterruptedException {
         Assertions.assertEquals(writtenItemMetadata, cloudItemMetadata);
 
         RecordedRequest rq = server.takeRequest();
-        Assertions.assertEquals("PROPFIND", rq.getMethod());
-        Assertions.assertEquals("0", rq.getHeader("DEPTH"));
-        Assertions.assertEquals("/cloud/remote.php/webdav/foo.txt", rq.getPath());
-        Assertions.assertEquals(webDavRequestBody, rq.getBody().readUtf8());
-
-        rq = server.takeRequest();
         Assertions.assertEquals("PUT", rq.getMethod());
         Assertions.assertEquals("/cloud/remote.php/webdav/foo.txt", rq.getPath());