mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 07:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in develop and addressed codacy

Browse Source
This commit is contained in:
U-BASIS\dsmyda 2020-03-26 12:19:13 -04:00
parent a48f5ba966
commit 0775c238ea
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoAccountsTest.java
View File

@ -66,11 +66,9 @@ public class CentralRepoAccountsTest extends TestCase {
sqliteSettings.setDbName(CR_DB_NAME);
sqliteSettings.setDbDirectory(testDirectory.toString());
if (!sqliteSettings.dbDirectoryExists()) {
if (!sqliteSettings.createDbDirectory()) {
if (!sqliteSettings.dbDirectoryExists() && !sqliteSettings.createDbDirectory()) {
Assert.fail("Failed to create central repo directory.");
}
}
RdbmsCentralRepoFactory factory = new RdbmsCentralRepoFactory(CentralRepoPlatforms.SQLITE, sqliteSettings);
if (!factory.initializeDatabaseSchema() || !factory.insertDefaultDatabaseContent()) {

2
Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java
View File

@ -220,7 +220,7 @@ class InterCaseTestUtils {
this.kitchenShink = new IngestJobSettings(InterCaseTestUtils.class.getCanonicalName(), IngestType.ALL_MODULES, kitchenSink);
try {
Collection<CorrelationAttributeInstance.Type> types = CentralRepository.getInstance().getCorrelationTypes();
Collection<CorrelationAttributeInstance.Type> types = CentralRepository.getInstance().getDefinedCorrelationTypes();
//TODO use ids instead of strings
FILE_TYPE = types.stream().filter(type -> type.getDisplayName().equals("Files")).findAny().get();