also verigy that dir entries are copied when copying a dir.

1 files changed, 7 insertions, 2 deletions

diff --git a/util/testsrc/org/aspectj/util/FileUtilTest.java b/util/testsrc/org/aspectj/util/FileUtilTest.java
index b39c092de..74f0e3923 100644
--- a/util/testsrc/org/aspectj/util/FileUtilTest.java
+++ b/util/testsrc/org/aspectj/util/FileUtilTest.java
@@ -254,9 +254,14 @@ public class FileUtilTest extends TestCase {
             assertTrue(null == exceptionClass);
             if (to.isFile()) {
                 assertTrue(from.length() == to.length()); // XXX cheap test
+            } else if (!from.isDirectory()){
+                File toFile = new File(to, from.getName());  
+               	assertTrue(from.length() == toFile.length()); 
             } else {
-                File toFile = new File(to, from.getName());                
-                assertTrue(from.length() == toFile.length()); 
+            	// from is a dir and to is a dir, toDir should be created, and have the
+            	// same contents as fromDir.
+            	assertTrue(to.exists());
+            	assertTrue(from.listFiles().length == to.listFiles().length);
             }
         } catch (Throwable t) {
             assertTrue(null != exceptionClass);