From 0775c238ea2a0c8655d3ca0ebb8ca65a9ae5e50f Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Thu, 26 Mar 2020 12:19:13 -0400 Subject: [PATCH] Merged in develop and addressed codacy --- .../datamodel/CentralRepoAccountsTest.java | 6 ++---- .../autopsy/commonpropertiessearch/InterCaseTestUtils.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoAccountsTest.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoAccountsTest.java index b7be711b2c..42a0517d98 100755 --- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoAccountsTest.java +++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoAccountsTest.java @@ -66,10 +66,8 @@ public class CentralRepoAccountsTest extends TestCase { sqliteSettings.setDbName(CR_DB_NAME); sqliteSettings.setDbDirectory(testDirectory.toString()); - if (!sqliteSettings.dbDirectoryExists()) { - if (!sqliteSettings.createDbDirectory()) { - Assert.fail("Failed to create central repo directory."); - } + if (!sqliteSettings.dbDirectoryExists() && !sqliteSettings.createDbDirectory()) { + Assert.fail("Failed to create central repo directory."); } RdbmsCentralRepoFactory factory = new RdbmsCentralRepoFactory(CentralRepoPlatforms.SQLITE, sqliteSettings); diff --git a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java index 96fd8be0e9..cb270a6082 100644 --- a/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java +++ b/Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java @@ -220,7 +220,7 @@ class InterCaseTestUtils { this.kitchenShink = new IngestJobSettings(InterCaseTestUtils.class.getCanonicalName(), IngestType.ALL_MODULES, kitchenSink); try { - Collection types = CentralRepository.getInstance().getCorrelationTypes(); + Collection types = CentralRepository.getInstance().getDefinedCorrelationTypes(); //TODO use ids instead of strings FILE_TYPE = types.stream().filter(type -> type.getDisplayName().equals("Files")).findAny().get();