From 552db976fd2c84238b0ec7616ca26b501f76b507 Mon Sep 17 00:00:00 2001 From: Fotis Xenakis Date: Tue, 9 Apr 2019 18:33:04 +0300 Subject: [PATCH] Remove CVS-specific code --- src/test/java/org/umlgraph/test/TestUtils.java | 7 +++---- src/test/java/org/umlgraph/test/UmlDocTest.java | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/umlgraph/test/TestUtils.java b/src/test/java/org/umlgraph/test/TestUtils.java index 9b1341f..3259d91 100644 --- a/src/test/java/org/umlgraph/test/TestUtils.java +++ b/src/test/java/org/umlgraph/test/TestUtils.java @@ -123,18 +123,17 @@ public class TestUtils { } /** - * Deletes the content of the folder, eventually in a recursive way (but - * avoids deleting eventual .cvsignore files and CVS folders) + * Deletes the content of the folder, eventually in a recursive way */ public static void cleanFolder(File folder, boolean recurse) { for (File f : folder.listFiles()) { - if (f.isDirectory() && !f.getName().equals("CVS")) { + if (f.isDirectory()) { if (recurse) { cleanFolder(f, true); if (f.list().length == 0) f.delete(); } - } else if (!f.getName().equals(".cvsignore")) { + } else { f.delete(); } diff --git a/src/test/java/org/umlgraph/test/UmlDocTest.java b/src/test/java/org/umlgraph/test/UmlDocTest.java index 4200878..9afbb33 100644 --- a/src/test/java/org/umlgraph/test/UmlDocTest.java +++ b/src/test/java/org/umlgraph/test/UmlDocTest.java @@ -88,9 +88,6 @@ public class UmlDocTest { */ private static void compareDocletOutputs(List differences, File refFolder, File outFolder) throws IOException { - if(refFolder.getName().equals("CVS")) - return; - if (!refFolder.exists() || !refFolder.isDirectory()) throw new IllegalArgumentException("Reference does not exist or is not a folder: " + refFolder.getAbsolutePath());