Skip to content

Commit b27e896

Browse files
rbrirbri
committed
fix temp file handling
1 parent ae5d784 commit b27e896

4 files changed

Lines changed: 42 additions & 0 deletions

File tree

‎src/test/java/org/htmlunit/TextPageTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public void save() throws Exception {
5050
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
5151
tmpFolder.mkdir();
5252
final File file = new File(tmpFolder, "hu_txt.plain");
53+
FileUtils.deleteQuietly(file);
54+
5355
page.save(file);
5456
assertTrue(file.exists());
5557
assertTrue(file.isFile());

‎src/test/java/org/htmlunit/html/HtmlPage2Test.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ public void save() throws Exception {
117117
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
118118
tmpFolder.mkdir();
119119
final File file = new File(tmpFolder, "hu_HtmlPageTest_save.html");
120+
FileUtils.deleteQuietly(file);
121+
120122
page.save(file);
121123
assertTrue(file.exists());
122124
assertTrue(file.isFile());
@@ -149,7 +151,10 @@ public void save_image() throws Exception {
149151
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
150152
tmpFolder.mkdir();
151153
final File file = new File(tmpFolder, "hu_HtmlPageTest_save2.html");
154+
FileUtils.deleteQuietly(file);
152155
final File imgFile = new File(tmpFolder, "hu_HtmlPageTest_save2/second.jpeg");
156+
FileUtils.deleteQuietly(imgFile);
157+
153158
page.save(file);
154159
assertTrue(file.exists());
155160
assertTrue(file.isFile());
@@ -176,6 +181,8 @@ public void save_imageNotImage() throws Exception {
176181
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
177182
tmpFolder.mkdir();
178183
final File file = new File(tmpFolder, "hu_save.html");
184+
FileUtils.deleteQuietly(file);
185+
179186
page.save(file);
180187
assertTrue(file.exists());
181188
assertTrue(file.isFile());
@@ -200,6 +207,8 @@ public void save_image_without_src() throws Exception {
200207
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
201208
tmpFolder.mkdir();
202209
final File file = new File(tmpFolder, "hu_HtmlPageTest_save3.html");
210+
FileUtils.deleteQuietly(file);
211+
203212
page.save(file);
204213
assertTrue(file.exists());
205214
assertTrue(file.isFile());
@@ -224,6 +233,8 @@ public void save_image_empty_src() throws Exception {
224233
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
225234
tmpFolder.mkdir();
226235
final File file = new File(tmpFolder, "hu_HtmlPageTest_save3.html");
236+
FileUtils.deleteQuietly(file);
237+
227238
page.save(file);
228239
assertTrue(file.exists());
229240
assertTrue(file.isFile());
@@ -276,10 +287,15 @@ public void save_frames() throws Exception {
276287
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
277288
tmpFolder.mkdir();
278289
final File file = new File(tmpFolder, "hu_HtmlPageTest_saveFrame.html");
290+
FileUtils.deleteQuietly(file);
279291
final File expectedLeftFrameFile = new File(tmpFolder, "hu_HtmlPageTest_saveFrame/second.html");
292+
FileUtils.deleteQuietly(expectedLeftFrameFile);
280293
final File expectedRightFrameFile = new File(tmpFolder, "hu_HtmlPageTest_saveFrame/third.html");
294+
FileUtils.deleteQuietly(expectedRightFrameFile);
281295
final File expectedIFrameFile = new File(tmpFolder, "hu_HtmlPageTest_saveFrame/second/iframe.html");
296+
FileUtils.deleteQuietly(expectedIFrameFile);
282297
final File expectedImgFile = new File(tmpFolder, "hu_HtmlPageTest_saveFrame/second/img.jpg");
298+
FileUtils.deleteQuietly(expectedImgFile);
283299
final File[] allFiles = {file, expectedLeftFrameFile, expectedImgFile, expectedIFrameFile,
284300
expectedRightFrameFile};
285301

@@ -320,7 +336,10 @@ public void save_css() throws Exception {
320336
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
321337
tmpFolder.mkdir();
322338
final File file = new File(tmpFolder, "hu_HtmlPageTest_save4.html");
339+
FileUtils.deleteQuietly(file);
323340
final File cssFile = new File(tmpFolder, "hu_HtmlPageTest_save4/second.css");
341+
FileUtils.deleteQuietly(cssFile);
342+
324343
page.save(file);
325344
assertTrue(file.exists());
326345
assertTrue(file.isFile());
@@ -347,6 +366,8 @@ public void save_css_without_href() throws Exception {
347366
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
348367
tmpFolder.mkdir();
349368
final File file = new File(tmpFolder, "hu_HtmlPageTest_save5.html");
369+
FileUtils.deleteQuietly(file);
370+
350371
page.save(file);
351372
assertTrue(file.exists());
352373
assertTrue(file.isFile());
@@ -373,6 +394,8 @@ public void save_css_empty_href() throws Exception {
373394
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
374395
tmpFolder.mkdir();
375396
final File file = new File(tmpFolder, "hu_HtmlPageTest_save5.html");
397+
FileUtils.deleteQuietly(file);
398+
376399
page.save(file);
377400
assertTrue(file.exists());
378401
assertTrue(file.isFile());
@@ -404,6 +427,8 @@ public void saveShouldStripLongFileNames() throws Exception {
404427
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
405428
tmpFolder.mkdir();
406429
final File file = new File(tmpFolder, "hu_HtmlPageTest_save.html");
430+
FileUtils.deleteQuietly(file);
431+
407432
page.save(file);
408433
assertTrue(file.exists());
409434
assertTrue(file.isFile());

‎src/test/java/org/htmlunit/html/HtmlSelectTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ public void savePageSavesSelectedOption() throws Exception {
761761
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
762762
tmpFolder.mkdir();
763763
final File file = new File(tmpFolder, "test.html");
764+
FileUtils.deleteQuietly(file);
765+
764766
page.save(file);
765767
final String html2 = FileUtils.readFileToString(file, UTF_8);
766768
final HtmlPage page2 = loadPage(html2);

‎src/test/java/org/htmlunit/html/XmlSerializerTest.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.net.UnknownHostException;
2020
import java.nio.file.Path;
2121

22+
import org.apache.commons.io.FileUtils;
2223
import org.htmlunit.MockWebConnection;
2324
import org.htmlunit.SimpleWebTestCase;
2425
import org.htmlunit.WebClient;
@@ -60,6 +61,8 @@ public void notExistingLink() throws Exception {
6061
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
6162
tmpFolder.mkdir();
6263
final File file = new File(tmpFolder, "hu_XmlSerializerTest_notExistingLink.html");
64+
FileUtils.deleteQuietly(file);
65+
6366
page.save(file);
6467
assertTrue(file.exists());
6568
assertTrue(file.isFile());
@@ -89,6 +92,8 @@ public void unknownHostExceptionLink() throws Exception {
8992
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
9093
tmpFolder.mkdir();
9194
final File file = new File(tmpFolder, "hu_XmlSerializerTest_unknownHostExceptionLink.html");
95+
FileUtils.deleteQuietly(file);
96+
9297
page.save(file);
9398
assertTrue(file.exists());
9499
assertTrue(file.isFile());
@@ -114,6 +119,8 @@ public void unsupportedProtocolLink() throws Exception {
114119
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
115120
tmpFolder.mkdir();
116121
final File file = new File(tmpFolder, "hu_XmlSerializerTest_unsupportedProtocol.html");
122+
FileUtils.deleteQuietly(file);
123+
117124
page.save(file);
118125
assertTrue(file.exists());
119126
assertTrue(file.isFile());
@@ -142,6 +149,8 @@ public void notExistingImage() throws Exception {
142149
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
143150
tmpFolder.mkdir();
144151
final File file = new File(tmpFolder, "hu_XmlSerializerTest_notExistingImage.html");
152+
FileUtils.deleteQuietly(file);
153+
145154
page.save(file);
146155
assertTrue(file.exists());
147156
assertTrue(file.isFile());
@@ -171,6 +180,8 @@ public void unknownHostExceptionImage() throws Exception {
171180
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
172181
tmpFolder.mkdir();
173182
final File file = new File(tmpFolder, "hu_XmlSerializerTest_unknownHostExceptionImage.html");
183+
FileUtils.deleteQuietly(file);
184+
174185
page.save(file);
175186
assertTrue(file.exists());
176187
assertTrue(file.isFile());
@@ -198,6 +209,8 @@ public void unsupportedProtocolImage() throws Exception {
198209
final File tmpFolder = new File(TEMP_DIR_.toFile(), "hu");
199210
tmpFolder.mkdir();
200211
final File file = new File(tmpFolder, "hu_XmlSerializerTest_unsupportedProtocolImage.html");
212+
FileUtils.deleteQuietly(file);
213+
201214
page.save(file);
202215
assertTrue(file.exists());
203216
assertTrue(file.isFile());

0 commit comments

Comments
 (0)