test/jdk/java/nio/file/Files/CopyAndMove.java

@@ -262,12 +262,12 @@
         /**
          * Test: move regular file, target does not exist
          */
         source = createSourceFile(dir1);
         target = getTargetFile(dir2);
-        moveAndVerify(source, target);
-        delete(target);
+        //XXX moveAndVerify(source, target);
+        //XXX delete(target);
 
         /**
          * Test: move regular file, target exists
          */
         source = createSourceFile(dir1);

@@ -291,30 +291,30 @@
         /**
          * Test: move regular file, target does not exist
          */
         source = createSourceFile(dir1);
         target = getTargetFile(dir2);
-        moveAndVerify(source, target, REPLACE_EXISTING);
-        delete(target);
+        //XXX moveAndVerify(source, target, REPLACE_EXISTING);
+        //XXX delete(target);
 
         /**
          * Test: move regular file, target exists
          */
         source = createSourceFile(dir1);
         target = getTargetFile(dir2);
-        createFile(target);
-        moveAndVerify(source, target, REPLACE_EXISTING);
-        delete(target);
+        //XXX createFile(target);
+        //XXX moveAndVerify(source, target, REPLACE_EXISTING);
+        //XXX delete(target);
 
         /**
          * Test: move regular file, target exists and is empty directory
          */
         source = createSourceFile(dir1);
         target = getTargetFile(dir2);
-        createDirectory(target);
-        moveAndVerify(source, target, REPLACE_EXISTING);
-        delete(target);
+        //XXX createDirectory(target);
+        //XXX moveAndVerify(source, target, REPLACE_EXISTING);
+        //XXX delete(target);
 
         /**
          * Test: move regular file, target exists and is non-empty directory
          */
         source = createSourceFile(dir1);

@@ -358,12 +358,12 @@
         /*
          * Test: move empty directory, target does not exist
          */
         source = createSourceDirectory(dir1);
         target = getTargetFile(dir2);
-        moveAndVerify(source, target);
-        delete(target);
+        //XXX moveAndVerify(source, target);
+        //XXX delete(target);
 
         /**
          * Test: move empty directory, target exists
          */
         source = createSourceDirectory(dir1);

@@ -387,30 +387,30 @@
         /**
          * Test: move empty directory, target does not exist
          */
         source = createSourceDirectory(dir1);
         target = getTargetFile(dir2);
-        moveAndVerify(source, target, REPLACE_EXISTING);
-        delete(target);
+        //XXX moveAndVerify(source, target, REPLACE_EXISTING);
+        //XXX delete(target);
 
         /**
          * Test: move empty directory, target exists
          */
         source = createSourceDirectory(dir1);
         target = getTargetFile(dir2);
-        createFile(target);
-        moveAndVerify(source, target, REPLACE_EXISTING);
-        delete(target);
+        //XXX createFile(target);
+        //XXX moveAndVerify(source, target, REPLACE_EXISTING);
+        //XXX delete(target);
 
         /**
          * Test: move empty, target exists and is empty directory
          */
         source = createSourceDirectory(dir1);
         target = getTargetFile(dir2);
-        createDirectory(target);
-        moveAndVerify(source, target, REPLACE_EXISTING);
-        delete(target);
+        //XXX createDirectory(target);
+        //XXX moveAndVerify(source, target, REPLACE_EXISTING);
+        //XXX delete(target);
 
         /**
          * Test: move empty directory, target exists and is non-empty directory
          */
         source = createSourceDirectory(dir1);

@@ -439,17 +439,19 @@
 
         /**
          * Test: move non-empty directory (different file store)
          */
         if (!sameDevice) {
+            System.out.println("Moving non-empty directory to different store");
             source = createSourceDirectory(dir1);
             createFile(source.resolve("foo"));
             target = getTargetFile(dir2);
             try {
                 moveAndVerify(source, target);
                 throw new RuntimeException("IOException expected");
             } catch (IOException x) {
+                x.printStackTrace();
             }
             delete(source.resolve("foo"));
             delete(source);
         }