From 45edbbdf36357d395741f5aeb0a28bb17d62401e Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Fri, 15 Oct 2021 08:12:06 -0400 Subject: [PATCH 1/2] changed 71 to 72 --- .../src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java index f5379a96f9..3f792e5fc5 100755 --- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java +++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java @@ -259,7 +259,7 @@ public class IngestFileFiltersTest extends NbTestCase { IngestUtils.runIngestJob(currentCase.getDataSources(), ingestJobSettings); FileManager fileManager = currentCase.getServices().getFileManager(); List results = fileManager.findFiles("%%"); - assertEquals(71, results.size()); + assertEquals(72, results.size()); int carvedJpgGifFiles = 0; for (AbstractFile file : results) { if (file.getNameExtension().equalsIgnoreCase("jpg") || file.getNameExtension().equalsIgnoreCase("gif")) { //Unalloc file and .jpg files in dir1, dir2, $CarvedFiles, root directory should have MIME type From c68b6c9557145652f93263be0c1fc802d93019d6 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Fri, 15 Oct 2021 09:03:01 -0400 Subject: [PATCH 2/2] fix file path issue --- .../src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java index 3f792e5fc5..5d674dea33 100755 --- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java +++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/ingest/IngestFileFiltersTest.java @@ -266,7 +266,7 @@ public class IngestFileFiltersTest extends NbTestCase { String errMsg = String.format("File %s (objId=%d) unexpectedly blocked by the file filter.", file.getName(), file.getId()); assertTrue(errMsg, file.getMIMEType() != null && !file.getMIMEType().isEmpty()); - if (file.getParentPath().equalsIgnoreCase("/$CarvedFiles/")) { + if (file.getParentPath().startsWith("/$CarvedFiles/")) { carvedJpgGifFiles++; } } else if (file.getName().startsWith("Unalloc_")) {