Merge pull request #88 from mikedurbin/relative-paths

Added support for mixed path types.

Author: johnscancella

src/main/java/gov/loc/repository/bagit/writer/RelativePathWriter.java

@@ -19,8 +19,7 @@ private RelativePathWriter(){
    * @return the relative path with only unix path separator
    */
   public static String formatRelativePathString(final Path relativeTo, final Path entry){
-    final String encodedPath = PathUtils.encodeFilename(relativeTo.relativize(entry));
-    
+    final String encodedPath = PathUtils.encodeFilename(relativeTo.toAbsolutePath().relativize(entry.toAbsolutePath()));
     return encodedPath.replace('\\', '/') + System.lineSeparator();
   }
 }

src/test/java/gov/loc/repository/bagit/writer/RelativePathWriterTest.java

@@ -22,4 +22,13 @@ public void testRelativePath(){
 
     assertEquals(expectedRelativePath, RelativePathWriter.formatRelativePathString(parent, child));
   }
+
+  @Test
+  public void testUsingBothRelativeAndAbsolutePaths(){
+    Path parent = Paths.get("one/two");
+    Path child = Paths.get("one/two/three").toAbsolutePath();
+    String expectedRelativePath = "three" + System.lineSeparator();
+
+    assertEquals(expectedRelativePath, RelativePathWriter.formatRelativePathString(parent, child));
+  }
 }