diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/EmbeddedFileTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/EmbeddedFileTest.java index 25d691ddbc..68d2398313 100755 --- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/EmbeddedFileTest.java +++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/EmbeddedFileTest.java @@ -22,6 +22,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import junit.framework.Test; @@ -31,6 +32,7 @@ import org.openide.util.Exceptions; import junit.framework.Assert; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.ImageDSProcessor; +import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.IngestJobSettings.IngestType; import org.sleuthkit.autopsy.modules.embeddedfileextractor.EmbeddedFileExtractorModuleFactory; import org.sleuthkit.autopsy.modules.hashdatabase.HashLookupModuleFactory; @@ -63,9 +65,14 @@ public class EmbeddedFileTest extends NbTestCase { super(name); } - @Override - public void setUp() { - openCase = CaseUtils.createAsCurrentCase(CASE_NAME + "_" + System.currentTimeMillis()); + + /** + * + * @param testName name of test (no white space) + */ + public void setUpTest(String testName) { + Logger.getLogger(this.getClass().getName()).log(Level.INFO, "----------- Starting Test: " + testName + " ----------"); //NON-NLS + openCase = CaseUtils.createAsCurrentCase(CASE_NAME + "_" + testName+ "_"+ System.currentTimeMillis()); ImageDSProcessor dataSourceProcessor = new ImageDSProcessor(); IngestUtils.addDataSource(dataSourceProcessor, IMAGE_PATH); @@ -92,6 +99,7 @@ public class EmbeddedFileTest extends NbTestCase { public void testEncryptionAndZipBomb() { try { + setUpTest("EncryptionAndZip"); List results = openCase.getSleuthkitCase().findAllFilesWhere("name LIKE '%%'"); final String zipBombSetName = "Possible Zip Bomb"; final String protectedName1 = "password_protected.zip"; @@ -139,6 +147,7 @@ public class EmbeddedFileTest extends NbTestCase { public void testBigFolder() { final int numOfFilesToTest = 1000; try { + setUpTest("BigFolder"); //Get all files under 'big folder' directory except '.' '..' 'slack' files List results = openCase.getSleuthkitCase().findAllFilesWhere("parent_path LIKE '%big folder/' and name != '.' and name != '..' and extension NOT LIKE '%slack'"); assertEquals(numOfFilesToTest, results.size()); //There are 1000 files @@ -163,6 +172,7 @@ public class EmbeddedFileTest extends NbTestCase { public void testDeepFolder() { try { + setUpTest("DeepFolder"); //Get all files under 'deep folder' directory except '.' '..' List results = openCase.getSleuthkitCase().findAllFilesWhere("parent_path LIKE '%deep folder/' and name != '.' and name != '..'"); assertEquals(1, results.size()); @@ -184,6 +194,7 @@ public class EmbeddedFileTest extends NbTestCase { public void testEmbeddedFile() { try { + setUpTest("EmbeddedFile"); //Query level3.txt under '/ZIP/embedded/level3.zip/' List results = openCase.getSleuthkitCase().findAllFilesWhere("name = 'level3.txt' and parent_path = '/ZIP/embedded/level3.zip/'"); assertEquals(1, results.size()); @@ -209,6 +220,7 @@ public class EmbeddedFileTest extends NbTestCase { public void testContent() { final int numOfFilesToTest = 1029; try { + setUpTest("Content"); //All files with txt extension should have the same hash value, //except the zip file with txt extension and the .txt files extracted from password protected zip shouldn't have hash value List results = openCase.getSleuthkitCase().findAllFilesWhere( @@ -232,6 +244,7 @@ public class EmbeddedFileTest extends NbTestCase { public void testExtension() { try { + setUpTest("Extension"); //Query zipFileWithTxtExtension.txt at extension folder List results = openCase.getSleuthkitCase().findAllFilesWhere("extension = 'txt' and parent_path = '/ZIP/extension/zipFileWithTxtExtension.txt/'"); assertEquals(1, results.size());