Merge pull request #3753 from wschaeferB/ChangeGetOpenCaseInTest-Develop

Fix merge error, updating getOpenCase to getCurrentCaseThrows
This commit is contained in:
esaunders 2018-05-08 17:24:37 -04:00 committed by GitHub
commit 70fae68153
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -61,12 +61,12 @@ public class EmbeddedFileTest extends NbTestCase {
@Override @Override
public void setUp() { public void setUp() {
CaseUtils.createCase(CASE_DIRECTORY_PATH); CaseUtils.createCase(CASE_DIRECTORY_PATH, "EmbeddedFileTest");
ImageDSProcessor dataSourceProcessor = new ImageDSProcessor(); ImageDSProcessor dataSourceProcessor = new ImageDSProcessor();
IngestUtils.addDataSource(dataSourceProcessor, IMAGE_PATH); IngestUtils.addDataSource(dataSourceProcessor, IMAGE_PATH);
try { try {
openCase = Case.getOpenCase(); openCase = Case.getCurrentCaseThrows();
} catch (NoCurrentCaseException ex) { } catch (NoCurrentCaseException ex) {
Exceptions.printStackTrace(ex); Exceptions.printStackTrace(ex);
Assert.fail(ex); Assert.fail(ex);

View File

@ -77,7 +77,7 @@ public class EncryptionDetectionTest extends NbTestCase {
*/ */
public void testPasswordProtection() { public void testPasswordProtection() {
try { try {
Case openCase = Case.getOpenCase(); Case openCase = Case.getCurrentCaseThrows();
/* /*
* Create ingest job settings. * Create ingest job settings.