From 3f72b366cd2b453e1e3476d131966b27d8936ad0 Mon Sep 17 00:00:00 2001 From: acolyer Date: Tue, 11 Nov 2003 14:07:49 +0000 Subject: [PATCH] ensure InpathTestCases still behave in the presence of CVS info in the directories. --- .../testsrc/org/aspectj/ajde/InpathTestcase.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java b/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java index b05c56707..9ec9f2cf2 100644 --- a/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java +++ b/ajde/testsrc/org/aspectj/ajde/InpathTestcase.java @@ -285,10 +285,12 @@ public class InpathTestcase extends AjdeTestCase { while (null != (entry = outjar.getNextEntry())) { String fileName = entry.getName(); fileName = fileName.replace('\\', '/'); - boolean b = expectedOutputJarContents.remove(fileName); - assertTrue( - "Unexpectedly found : " + fileName + " in outjar", - b); + if (fileName.indexOf("CVS") == -1) { + boolean b = expectedOutputJarContents.remove(fileName); + assertTrue( + "Unexpectedly found : " + fileName + " in outjar", + b); + } outjar.closeEntry(); } outjar.close(); @@ -348,8 +350,10 @@ public class InpathTestcase extends AjdeTestCase { String[] toResources = FileUtil.listFiles(binBase); for (int i = 0; i < toResources.length; i++) { String fileName = toResources[i]; - boolean b = expectedOutdirContents.remove(fileName); - assertTrue("Extraneous resources: " + fileName, b); + if (fileName.indexOf("CVS") == -1) { + boolean b = expectedOutdirContents.remove(fileName); + assertTrue("Extraneous resources: " + fileName, b); + } } assertTrue( -- 2.39.5