Better method names
diff --git a/src/test/java/org/apache/bcel/AbstractTestCase.java b/src/test/java/org/apache/bcel/AbstractTestCase.java
index af1d505..e4e03b9 100644
--- a/src/test/java/org/apache/bcel/AbstractTestCase.java
+++ b/src/test/java/org/apache/bcel/AbstractTestCase.java
@@ -85,6 +85,38 @@
return new File(TESTDATA, name);
}
+ /**
+ * Deletes a file under the TESTDATA directory
+ *
+ * @param name
+ * @return
+ */
+ protected boolean delete(final String name) {
+ return new File(TESTDATA, name).delete();
+ }
+
+ /**
+ * Deletes a directory and file under the TESTDATA directory
+ *
+ * @param dir
+ * @param name
+ * @return true if the file was deleted
+ */
+ protected boolean delete(final String dir, final String name) {
+ // The parameter is relative to the TESTDATA dir
+ final boolean b = delete(dir + File.separator + name);
+ final File testDir = new File(TESTDATA, dir);
+ final String[] files = testDir.list();
+ if (files == null || files.length == 0) {
+ if (!testDir.delete()) {
+ System.err.println("Failed to remove: " + testDir);
+ }
+ } else {
+ System.err.println("Non-empty directory: " + testDir);
+ }
+ return b;
+ }
+
protected String dumpAnnotationEntries(final AnnotationEntry[] as) {
final StringBuilder result = new StringBuilder();
result.append("[");
@@ -163,36 +195,4 @@
return SyntheticRepository.getInstance().loadClass(name);
}
- /**
- * Delete a file under the TESTDATA directory
- *
- * @param name
- * @return
- */
- protected boolean wipe(final String name) {
- return new File(TESTDATA, name).delete();
- }
-
- /**
- * Delete a directory and file under the TESTDATA directory
- *
- * @param dir
- * @param name
- * @return true if the file was deleted
- */
- protected boolean wipe(final String dir, final String name) {
- // The parameter is relative to the TESTDATA dir
- final boolean b = wipe(dir + File.separator + name);
- final File testDir = new File(TESTDATA, dir);
- final String[] files = testDir.list();
- if (files == null || files.length == 0) {
- if (!testDir.delete()) {
- System.err.println("Failed to remove: " + testDir);
- }
- } else {
- System.err.println("Non-empty directory: " + testDir);
- }
- return b;
- }
-
}
diff --git a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
index a2d7798..762f6fd 100644
--- a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
@@ -390,7 +390,7 @@
i = mg.getAnnotationEntries().length;
assertEquals(1, i, "Wrong number of annotations on the main 'MethodGen'");
- assertTrue(wipe("temp1", "HelloWorld.class"));
+ assertTrue(delete("temp1", "HelloWorld.class"));
}
/**
@@ -427,8 +427,8 @@
assertEquals(1, mainMethod2.getAnnotationEntries().length, "Wrong number of annotations on the 'MethodGen'");
mainMethod2.removeAnnotationEntries();
assertEquals(0, mainMethod2.getAnnotationEntries().length, 0, "Wrong number of annotations on the 'MethodGen'");
- assertTrue(wipe("temp2", "HelloWorld.class"));
- assertTrue(wipe("temp3", "HelloWorld.class"));
+ assertTrue(delete("temp2", "HelloWorld.class"));
+ assertTrue(delete("temp3", "HelloWorld.class"));
}
/**
@@ -442,7 +442,7 @@
cgen.addAnnotationEntry(createFruitAnnotation(cp, "Pineapple"));
assertEquals(2, cgen.getAnnotationEntries().length, "Wrong number of annotations");
dumpClass(cgen, "SimpleAnnotatedClass.class");
- assertTrue(wipe("SimpleAnnotatedClass.class"));
+ assertTrue(delete("SimpleAnnotatedClass.class"));
}
/**
@@ -458,7 +458,7 @@
dumpClass(cgen, "SimpleAnnotatedClass.class");
final JavaClass jc2 = getClassFrom(".", "SimpleAnnotatedClass");
jc2.getAnnotationEntries();
- assertTrue(wipe("SimpleAnnotatedClass.class"));
+ assertTrue(delete("SimpleAnnotatedClass.class"));
// System.err.println(jc2.toString());
}
