Bottom Up test added

Bottom up test starts at each leaf and verifies that get parent actually
gets the correct content object.

bindings/java/test/org/sleuthkit/datamodel/BottomUpTest.java

+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.sleuthkit.datamodel;
+
+import java.io.FileWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Scanner;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ *
+ * @author smoss
+ */
+@RunWith(Parameterized.class)
+public class BottomUpTest {
+		
+
+	private List<String> imagePaths;
+
+	
+	public BottomUpTest(List<String> imagePaths) {
+		this.imagePaths = imagePaths;
+	}
+	/**
+	 * Get the sets of filenames for each test image, they should be located in 
+	 * the folder specified by the 
+	 * @return A Collection of one-element Object arrays, where that one element
+	 * is a List<String> containing the image file paths (the type is weird
+	 * because that's what JUnit wants for parameters).
+	 */
+	@Parameterized.Parameters
+	public static Collection<Object[]> testImageData() {
+		Collection<Object[]> data = new ArrayList<Object[]>();
+		
+		for (Object imagePaths : DiffUtil.getImagePaths()) {
+			data.add(new Object[]{imagePaths});
+		}
+		return data;
+	}
+	
+	@Test
+	public void testBottomUpDiff() {
+		try{
+			String title = (new java.io.File(imagePaths.get(0))).getName();
+			java.io.File testFolder=new java.io.File(System.getProperty(DiffUtil.RSLT, "test"+java.io.File.separator+"Output"+java.io.File.separator+"Results"));
+			title = title.replace(".001", "").replace(".img","").replace(".dd", "").replace(".E01", "").replace(".raw", "");
+			java.io.File standardFile = new java.io.File(testFolder.getAbsolutePath()+java.io.File.separator+title+"_BU.txt");
+			String tempDirPath= testFolder.getAbsolutePath();
+			java.io.File tempDir = new java.io.File(tempDirPath);
+			String dbPath = tempDir.getPath() + java.io.File.separator + title + "_BU" + ".db";
+			java.io.File dbFile = new java.io.File(dbPath);
+			dbFile.delete();
+			SleuthkitCase sk = SleuthkitCase.newCase(dbPath);
+			String timezone = "";
+			title = title + ".txt";
+			SleuthkitJNI.CaseDbHandle.AddImageProcess process = sk.makeAddImageProcess(timezone, true, false);
+			java.io.File exfile = new java.io.File(standardFile.toString().replace(".txt",DiffUtil.EX+".txt"));
+			exfile.createNewFile();
+			try{
+				process.run(imagePaths.toArray(new String[imagePaths.size()]));
+			}catch (TskDataException ex){
+				FileWriter exwriter=new FileWriter(exfile);
+				exwriter.append(ex.toString());
+				exwriter.flush();
+				exwriter.close();
+			}
+			process.commit();
+			java.io.File lvs = new java.io.File(testFolder.getAbsolutePath()+java.io.File.separator+title.replace(".txt", DiffUtil.LVS+".txt"));
+			Scanner climber = new Scanner(lvs);
+			Content c = null;
+			while(climber.hasNextLine())
+			{
+				String cliNL = climber.nextLine();
+				cliNL = cliNL.substring(1);
+				String[] ids = cliNL.split("[\\],]\\s?+");
+				c=sk.getContentById(Integer.parseInt(ids[0]));
+				for(int x = 0; x<ids.length; x++)
+				{
+					assertEquals("Got ID " + c.getId() + " should have gotten ID " + ids[x], ids[x].equals(((Long)c.getId()).toString()), true);
+					c = c.getParent();
+				}
+			}
+		} catch (Exception ex)
+		{
+			System.out.println(ex.toString());
+			fail("Failed to run BottomUp test");
+		}
+	}
+}

bindings/java/test/org/sleuthkit/datamodel/DatamodeltestSuite.java

@@ -13,7 +13,7 @@
  * @author smoss
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({org.sleuthkit.datamodel.TopDownTraversal.class,org.sleuthkit.datamodel.SequentialTest.class,org.sleuthkit.datamodel.CrossCompare.class})
+@Suite.SuiteClasses({org.sleuthkit.datamodel.TopDownTraversal.class,org.sleuthkit.datamodel.BottomUpTest.class,org.sleuthkit.datamodel.SequentialTest.class,org.sleuthkit.datamodel.CrossCompare.class})
 public class DatamodeltestSuite {
 	@BeforeClass
 	public static void setUpClass() throws Exception{

bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java

@@ -74,43 +74,4 @@ public void testTopDownDiff() {
 			fail("Couldn't open gold standard file.");
 		}
 	}
-	
-	@Ignore @Test
-	public void testBottomUpDiff() {
-		try{
-			String title = (new java.io.File(imagePaths.get(0))).getName();
-			java.io.File testFolder=new java.io.File(System.getProperty(DiffUtil.RSLT, "test"+java.io.File.separator+"Output"+java.io.File.separator+"Results"));
-			String out = title.replace(".001", "").replace(".img","").replace(".dd", "").replace(".E01", "").replace(".raw", "");
-			java.io.File standardFile = new java.io.File(testFolder.getAbsolutePath()+java.io.File.separator+out+DiffUtil.TD+".txt");
-			String tempDirPath= testFolder.getAbsolutePath();
-			java.io.File tempDir = new java.io.File(tempDirPath);
-			String dbPath = tempDir.getPath() + java.io.File.separator + title + "_BU" + ".db";
-			java.io.File dbFile = new java.io.File(dbPath);
-			dbFile.delete();
-			SleuthkitCase sk = SleuthkitCase.newCase(dbPath);
-			String timezone = "";
-			SleuthkitJNI.CaseDbHandle.AddImageProcess process = sk.makeAddImageProcess(timezone, true, false);
-			java.io.File exfile = new java.io.File(standardFile.toString().replace(".txt",DiffUtil.EX+".txt"));
-			exfile.createNewFile();
-			try{
-				process.run(imagePaths.toArray(new String[imagePaths.size()]));
-			}catch (TskDataException ex){
-				FileWriter exwriter=new FileWriter(exfile);
-				exwriter.append(ex.toString());
-				exwriter.flush();
-				exwriter.close();
-			}
-			java.io.File lvs = new java.io.File(testFolder.getAbsolutePath()+java.io.File.separator+title.replace(".txt", DiffUtil.LVS+".txt"));
-			Scanner climber = new Scanner(lvs);
-			Content c = sk.getRootObjects().get(0);
-			String split = ",[ ]";
-			while(climber.hasNextLine())
-			{
-				
-			}
-		} catch (Exception ex)
-		{
-			fail("Failed to run BottomUp test");
-		}
-	}
 }
\ No newline at end of file