/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache license, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the license for the specific language governing permissions and
 * limitations under the license.
 */
package org.apache.logging.log4j.junit;

import java.io.File;
import java.sql.Date;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.junit.rules.ExternalResource;

import static org.junit.Assert.*;

/**
 * A JUnit test rule to automatically delete certain files after a test is run.
 */
public class CleanFiles extends ExternalResource {
    private final List<File> files;

    public CleanFiles(final File... files) {
        this.files = Arrays.asList(files);
    }

    public CleanFiles(final String... fileNames) {
        this.files = new ArrayList<>(fileNames.length);
        for (final String fileName : fileNames) {
            this.files.add(new File(fileName));
        }
    }

    private void clean() {
        for (final File file : files) {
            if (file.exists()) {
                final boolean deleted = file.delete();
                if (!deleted) {
                    file.deleteOnExit();
                }
                assertTrue(
                        "Could not delete " + file.toString() + ", last modified "
                                + DateFormat.getInstance().format(new Date(file.lastModified())), deleted);
            }
        }
    }

    @Override
    protected void after() {
        this.clean();
    }
}

@@ -872,45 +872,56 @@
 ava.
-sql.Date;%0Aimport java.text.DateFormat
+io.IOException;%0Aimport java.nio.file.FileSystems
 ;%0Aim
@@ -1685,215 +1685,160 @@
     
-final boolean deleted = file.delete();%0A                if (!deleted) %7B%0A                    file.deleteOnExit();%0A                %7D%0A                assertTrue(%0A                        %22Could not delete %22 +
+try %7B%0A                    FileSystems.getDefault().provider().delete(file.toPath());%0A                %7D catch (IOException e) %7B%0A                   
  f
+a
 il
+(
 e.to
@@ -1849,137 +1849,28 @@
 ng()
- + %22, last modified %22%0A                                + DateFormat.getInstance().format(new Date(file.lastModified())), deleted);
+);%0A                %7D
 %0A   

improve error message if delete fails