From a06cfb3c0c1e57c761220a681ab6146f9f0294c1 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 8 May 2018 16:22:06 -0400 Subject: [PATCH 1/2] Fix merge error, updating getOpenCase to getCurrentCaseThrows in encryption detection test --- .../modules/encryptiondetection/EncryptionDetectionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionTest.java index b1963c3fd0..41844fb62f 100755 --- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionTest.java +++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/modules/encryptiondetection/EncryptionDetectionTest.java @@ -77,7 +77,7 @@ public class EncryptionDetectionTest extends NbTestCase { */ public void testPasswordProtection() { try { - Case openCase = Case.getOpenCase(); + Case openCase = Case.getCurrentCaseThrows(); /* * Create ingest job settings. From 650de5096967dab96b3ea0b1b3545dfab7bd70ba Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 8 May 2018 16:37:34 -0400 Subject: [PATCH 2/2] fix additional test related merge refactoring issues --- .../src/org/sleuthkit/autopsy/ingest/EmbeddedFileTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 36ecd56d8f..663a49a666 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 @@ -61,12 +61,12 @@ public class EmbeddedFileTest extends NbTestCase { @Override public void setUp() { - CaseUtils.createCase(CASE_DIRECTORY_PATH); + CaseUtils.createCase(CASE_DIRECTORY_PATH, "EmbeddedFileTest"); ImageDSProcessor dataSourceProcessor = new ImageDSProcessor(); IngestUtils.addDataSource(dataSourceProcessor, IMAGE_PATH); try { - openCase = Case.getOpenCase(); + openCase = Case.getCurrentCaseThrows(); } catch (NoCurrentCaseException ex) { Exceptions.printStackTrace(ex); Assert.fail(ex);