Add tests for moving and copying files from one JimfsFileSystem to another (moves/copies to FileSystems with different FileSystemProviders are handled by the Files class itself). Also fix an issue where attributes other than basic attributes were being copied from one file to a file on a different file system when COPY_ATTRIBUTES was specified--there's no guarantee that the other file system will support all the file attribute views the source file system does.

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=63161492

4 files changed, 70 insertions, 32 deletions

diff --git a/jimfs/src/main/java/com/google/jimfs/AttributeCopyOption.java b/jimfs/src/main/java/com/google/jimfs/AttributeCopyOption.java
new file mode 100644
index 0000000..2ae5eaf
--- /dev/null
+++ b/jimfs/src/main/java/com/google/jimfs/AttributeCopyOption.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.jimfs;
+
+/**
+ * Options for how to handle copying of file attributes when copying a file.
+ *
+ * @author Colin Decker
+ */
+enum AttributeCopyOption {
+  /** Copy all attributes on the file. */
+  ALL,
+  /** Copy only the basic attributes (file times) of the file. */
+  BASIC,
+  /** Do not copy any of the file's attributes. */
+  NONE
+}
+
diff --git a/jimfs/src/main/java/com/google/jimfs/AttributeService.java b/jimfs/src/main/java/com/google/jimfs/AttributeService.java
index 8787775..d28eb84 100644
--- a/jimfs/src/main/java/com/google/jimfs/AttributeService.java
+++ b/jimfs/src/main/java/com/google/jimfs/AttributeService.java
@@ -181,17 +181,19 @@ final class AttributeService {
   }
 
   /**
-   * Copies the file times of the given file to the given copy file.
-   */
-  public void copyBasicAttributes(File file, File copy) {
-    file.copyBasicAttributes(copy);
-  }
-
-  /**
    * Copies the attributes of the given file to the given copy file.
    */
-  public void copyAttributes(File file, File copy) {
-    file.copyAttributes(copy);
+  public void copyAttributes(File file, File copy, AttributeCopyOption copyOption) {
+    switch (copyOption) {
+      case ALL:
+        file.copyAttributes(copy);
+        break;
+      case BASIC:
+        file.copyBasicAttributes(copy);
+        break;
+      default:
+        // don't copy
+    }
   }
 
   /**
diff --git a/jimfs/src/main/java/com/google/jimfs/FileSystemView.java b/jimfs/src/main/java/com/google/jimfs/FileSystemView.java
index 2418058..42cf8b2 100644
--- a/jimfs/src/main/java/com/google/jimfs/FileSystemView.java
+++ b/jimfs/src/main/java/com/google/jimfs/FileSystemView.java
@@ -572,20 +572,35 @@ final class FileSystemView {
         }
       }
 
-      // can only do an actual move within one file system instance
-      // otherwise we have to copy and delete
       if (move && sameFileSystem) {
+        // Real move on the same file system.
         sourceParent.unlink(source.name());
         sourceParent.updateModifiedTime();
 
         destParent.link(dest.name(), sourceFile);
         destParent.updateModifiedTime();
       } else {
-        // copy
-        boolean copyAttributes = options.contains(COPY_ATTRIBUTES) && !move;
+        // Doing a copy OR a move to a different file system, which must be implemented by copy and
+        // delete.
 
-        // copy the file, but don't copy its content while we're holding the file store locks
-        copyFile = destView.store.copyWithoutContent(sourceFile, copyAttributes);
+        // By default, don't copy attributes.
+        AttributeCopyOption attributeCopyOption = AttributeCopyOption.NONE;
+        if (move) {
+          // Copy only the basic attributes of the file to the other file system, as it may not
+          // support all the attribute views that this file system does. This also matches the
+          // behavior of moving a file to a foreign file system with a different
+          // FileSystemProvider.
+          attributeCopyOption = AttributeCopyOption.BASIC;
+        } else if (options.contains(COPY_ATTRIBUTES)) {
+          // As with move, if we're copying the file to a different file system, only copy its
+          // basic attributes.
+          attributeCopyOption = sameFileSystem
+              ? AttributeCopyOption.ALL
+              : AttributeCopyOption.BASIC;
+        }
+
+        // Copy the file, but don't copy its content while we're holding the file store locks.
+        copyFile = destView.store.copyWithoutContent(sourceFile, attributeCopyOption);
         destParent.link(dest.name(), copyFile);
         destParent.updateModifiedTime();
 
@@ -597,10 +612,8 @@ final class FileSystemView {
         lockSourceAndCopy(sourceFile, copyFile);
 
         if (move) {
-          store.copyBasicAttributes(sourceFile, copyFile);
-
-          // it should not be possible for delete to throw an exception here, because we already
-          // checked that the file was deletable above
+          // It should not be possible for delete to throw an exception here, because we already
+          // checked that the file was deletable above.
           delete(sourceEntry, DeleteMode.ANY, source);
         }
       }
diff --git a/jimfs/src/main/java/com/google/jimfs/JimfsFileStore.java b/jimfs/src/main/java/com/google/jimfs/JimfsFileStore.java
index 4819fe2..fe2dedc 100644
--- a/jimfs/src/main/java/com/google/jimfs/JimfsFileStore.java
+++ b/jimfs/src/main/java/com/google/jimfs/JimfsFileStore.java
@@ -148,15 +148,13 @@ final class JimfsFileStore extends FileStore {
   }
 
   /**
-   * Creates a copy of the given file, copying its attributes as well if copy attributes is true.
-   * Returns the copy.
+   * Creates a copy of the given file, copying its attributes as well according to the given
+   * {@code attributeCopyOption}.
    */
-  File copyWithoutContent(File file, boolean copyAttributes) throws IOException {
+  File copyWithoutContent(File file, AttributeCopyOption attributeCopyOption) throws IOException {
     File copy = factory.copyWithoutContent(file);
     setInitialAttributes(copy);
-    if (copyAttributes) {
-      attributes.copyAttributes(file, copy);
-    }
+    attributes.copyAttributes(file, copy, attributeCopyOption);
     return copy;
   }
 
@@ -169,13 +167,6 @@ final class JimfsFileStore extends FileStore {
   }
 
   /**
-   * Copies the basic attributes (just file times) of the given file to the given copy file.
-   */
-  void copyBasicAttributes(File file, File copy) {
-    attributes.copyBasicAttributes(file, copy);
-  }
-
-  /**
    * Returns an attribute view of the given type for the given file lookup callback, or
    * {@code null} if the view type is not supported.
    */