aboutsummaryrefslogtreecommitdiffstats
path: root/ajde/testsrc
diff options
context:
space:
mode:
authoracolyer <acolyer>2003-11-11 14:07:49 +0000
committeracolyer <acolyer>2003-11-11 14:07:49 +0000
commit3f72b366cd2b453e1e3476d131966b27d8936ad0 (patch)
tree8b4ecf258fb8dc56594fca7b97af2986309fadde /ajde/testsrc
parentdc9c26dfe28b0b050296c97a9019e971aea5b84c (diff)
downloadaspectj-3f72b366cd2b453e1e3476d131966b27d8936ad0.tar.gz
aspectj-3f72b366cd2b453e1e3476d131966b27d8936ad0.zip
ensure InpathTestCases still behave in the presence of CVS info
in the directories.
Diffstat (limited to 'ajde/testsrc')
-rw-r--r--ajde/testsrc/org/aspectj/ajde/InpathTestcase.java16
1 files 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(