From ee61f91b3e4541d405bd92c2ba2486ceb4c3b46f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 24 Jul 2018 21:17:48 +0300
Subject: correctly cleanup temp files in tests

---
 .../java/com/juick/server/tests/ServerTests.java   | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'juick-server/src/test/java/com/juick')

diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index e4e5f298..824a10e5 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -1101,14 +1101,18 @@ public class ServerTests {
     @Test
     public void changeExtensionWhenReceiveFileWithWrongContentType() throws Exception {
         Path pngOutput = Paths.get(tmpDir, "cmyk.png");
-        Files.delete(pngOutput);
-        Files.copy(getClass().getClassLoader().getResourceAsStream("cmyk.jpg"), pngOutput);
-        assertThat(pngOutput.toFile().exists(), is(true));
-        CommandResult postJpgCmyk = commandsManager.processCommand(ugnich, "YO", pngOutput.toUri());
-        assertThat(postJpgCmyk.getNewMessage().isPresent(), is(true));
-        assertThat(postJpgCmyk.getNewMessage().get().getAttachmentType(), is("jpg"));
-        CommandResult replyJpgCmyk = commandsManager.processCommand(ugnich, String.format("#%d YO", postJpgCmyk.getNewMessage().get().getMid()), pngOutput.toUri());
-        assertThat(replyJpgCmyk.getNewMessage().isPresent(), is(true));
-        assertThat(replyJpgCmyk.getNewMessage().get().getAttachmentType(), is("jpg"));
+        Files.deleteIfExists(pngOutput);
+        try {
+            Files.copy(getClass().getClassLoader().getResourceAsStream("cmyk.jpg"), pngOutput);
+            assertThat(pngOutput.toFile().exists(), is(true));
+            CommandResult postJpgCmyk = commandsManager.processCommand(ugnich, "YO", pngOutput.toUri());
+            assertThat(postJpgCmyk.getNewMessage().isPresent(), is(true));
+            assertThat(postJpgCmyk.getNewMessage().get().getAttachmentType(), is("jpg"));
+            CommandResult replyJpgCmyk = commandsManager.processCommand(ugnich, String.format("#%d YO", postJpgCmyk.getNewMessage().get().getMid()), pngOutput.toUri());
+            assertThat(replyJpgCmyk.getNewMessage().isPresent(), is(true));
+            assertThat(replyJpgCmyk.getNewMessage().get().getAttachmentType(), is("jpg"));
+        } finally {
+            Files.deleteIfExists(pngOutput);
+        }
     }
 }
-- 
cgit v1.2.3