refs #48 - fetch items should be resolved relative to base directory instead of to data directory

Author: johnscancella

src/main/java/gov/loc/repository/bagit/verify/BagVerifier.java

@@ -205,7 +205,7 @@ public void isComplete(Bag bag, boolean ignoreHiddenFiles) throws
 
     Path dataDir = getDataDir(bag);
 
-    checkFetchItemsExist(bag.getItemsToFetch(), dataDir);
+    checkFetchItemsExist(bag.getItemsToFetch(), bag.getRootDir());
 
     checkBagitFileExists(bag.getRootDir(), bag.getVersion());
 
@@ -226,10 +226,10 @@ protected Path getDataDir(Bag bag){
     return bag.getRootDir().resolve(PAYLOAD_DIR_NAME);
   }
 
-  protected void checkFetchItemsExist(List<FetchItem> items, Path dataDir) throws FileNotInPayloadDirectoryException{
-    logger.info("Checking if all [{}] items in fetch.txt exist in the [{}]", items.size(), dataDir);
+  protected void checkFetchItemsExist(List<FetchItem> items, Path bagDir) throws FileNotInPayloadDirectoryException{
+    logger.info("Checking if all [{}] items in fetch.txt exist in the [{}]", items.size(), bagDir);
     for(FetchItem item : items){
-      Path file = dataDir.resolve(item.path);
+      Path file = bagDir.resolve(item.path);
       if(!Files.exists(file)){
         throw new FileNotInPayloadDirectoryException("Fetch item " + item + " has not been fetched!");
       }

src/test/java/gov/loc/repository/bagit/verify/BagVerifierTest.java

@@ -131,7 +131,7 @@ public void testIsComplete() throws Exception{
 
   @Test(expected=FileNotInPayloadDirectoryException.class)
   public void testErrorWhenFetchItemsDontExist() throws Exception{
-    rootDir = Paths.get(getClass().getClassLoader().getResource("bags/v0_96/holey-bag").toURI());
+    rootDir = Paths.get(getClass().getClassLoader().getResource("bad-fetch-bag").toURI());
     Bag bag = reader.read(rootDir);
 
     sut.isComplete(bag, true);