test fixes

This commit is contained in:
Greg DiCristofaro 2021-12-02 11:26:25 -05:00
parent 7410994ec7
commit 5c95ce24fc

View File

@ -537,28 +537,28 @@ public class TableSearchTest extends NbTestCase {
DataArtifactSearchParam param = new DataArtifactSearchParam(BlackboardArtifact.Type.TSK_CONTACT, null);
DataArtifactDAO dataArtifactDAO = MainDAO.getInstance().getDataArtifactsDAO();
DataArtifactTableSearchResultsDTO results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null, false);
DataArtifactTableSearchResultsDTO results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_CONTACT, results.getArtifactType());
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// Get contacts from data source 2
param = new DataArtifactSearchParam(BlackboardArtifact.Type.TSK_CONTACT, dataSource2.getId());
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null, false);
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_CONTACT, results.getArtifactType());
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get bookmarks from data source 2
param = new DataArtifactSearchParam(BlackboardArtifact.Type.TSK_WEB_BOOKMARK, dataSource2.getId());
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null, false);
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_WEB_BOOKMARK, results.getArtifactType());
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Get all custom artifacts
param = new DataArtifactSearchParam(customDataArtifactType, null);
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null, false);
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, null);
assertEquals(customDataArtifactType, results.getArtifactType());
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -595,7 +595,7 @@ public class TableSearchTest extends NbTestCase {
// Get the first page
param = new DataArtifactSearchParam(BlackboardArtifact.Type.TSK_WEB_BOOKMARK, null);
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, pageSize, false);
results = dataArtifactDAO.getDataArtifactsForTable(param, 0, pageSize);
assertEquals(ARTIFACT_COUNT_WEB_BOOKMARK, results.getTotalResultsCount());
assertEquals(pageSize.longValue(), results.getItems().size());
@ -611,7 +611,7 @@ public class TableSearchTest extends NbTestCase {
// Get the second page
param = new DataArtifactSearchParam(BlackboardArtifact.Type.TSK_WEB_BOOKMARK, null);
results = dataArtifactDAO.getDataArtifactsForTable(param, pageSize, pageSize, false);
results = dataArtifactDAO.getDataArtifactsForTable(param, pageSize, pageSize);
assertEquals(ARTIFACT_COUNT_WEB_BOOKMARK, results.getTotalResultsCount());
assertEquals(ARTIFACT_COUNT_WEB_BOOKMARK - pageSize, results.getItems().size());
@ -639,19 +639,19 @@ public class TableSearchTest extends NbTestCase {
// Get emails from all data sources
CommAccountsSearchParams param = new CommAccountsSearchParams(Account.Type.EMAIL, null);
SearchResultsDTO results = commAccountsDAO.getCommAcounts(param, 0, null, false);
SearchResultsDTO results = commAccountsDAO.getCommAcounts(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// Get device accounts from data source 1
param = new CommAccountsSearchParams(Account.Type.DEVICE, dataSource1.getId());
results = commAccountsDAO.getCommAcounts(param, 0, null, false);
results = commAccountsDAO.getCommAcounts(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get email accounts from data source 2
param = new CommAccountsSearchParams(Account.Type.EMAIL, dataSource2.getId());
results = commAccountsDAO.getCommAcounts(param, 0, null, false);
results = commAccountsDAO.getCommAcounts(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -671,13 +671,13 @@ public class TableSearchTest extends NbTestCase {
// Get phone accounts from all data sources
param = new CommAccountsSearchParams(Account.Type.PHONE, null);
results = commAccountsDAO.getCommAcounts(param, 0, null, false);
results = commAccountsDAO.getCommAcounts(param, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// Get phone accounts from data source 2
param = new CommAccountsSearchParams(Account.Type.PHONE, dataSource2.getId());
results = commAccountsDAO.getCommAcounts(param, 0, null, false);
results = commAccountsDAO.getCommAcounts(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -705,37 +705,37 @@ public class TableSearchTest extends NbTestCase {
// Get plain text files from data source 1
FileTypeMimeSearchParams param = new FileTypeMimeSearchParams("text/plain", dataSource1.getId());
SearchResultsDTO results = viewsDAO.getFilesByMime(param, 0, null, false);
SearchResultsDTO results = viewsDAO.getFilesByMime(param, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// Get jpeg files from data source 1
param = new FileTypeMimeSearchParams("image/jpeg", dataSource1.getId());
results = viewsDAO.getFilesByMime(param, 0, null, false);
results = viewsDAO.getFilesByMime(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get jpeg files from data source 2
param = new FileTypeMimeSearchParams("image/jpeg", dataSource2.getId());
results = viewsDAO.getFilesByMime(param, 0, null, false);
results = viewsDAO.getFilesByMime(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Search for mime type that should produce no results
param = new FileTypeMimeSearchParams("blah/blah", null);
results = viewsDAO.getFilesByMime(param, 0, null, false);
results = viewsDAO.getFilesByMime(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Get plain text files from all data sources
param = new FileTypeMimeSearchParams("text/plain", null);
results = viewsDAO.getFilesByMime(param, 0, null, false);
results = viewsDAO.getFilesByMime(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// Get the custom file by MIME type
param = new FileTypeMimeSearchParams(CUSTOM_MIME_TYPE, null);
results = viewsDAO.getFilesByMime(param, 0, null, false);
results = viewsDAO.getFilesByMime(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -760,31 +760,31 @@ public class TableSearchTest extends NbTestCase {
// Get "50 - 200MB" files from data source 1
FileTypeSizeSearchParams param = new FileTypeSizeSearchParams(FileSizeFilter.SIZE_50_200, dataSource1.getId());
SearchResultsDTO results = viewsDAO.getFilesBySize(param, 0, null, false);
SearchResultsDTO results = viewsDAO.getFilesBySize(param, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// Get "200MB - 1GB" files from data source 1
param = new FileTypeSizeSearchParams(FileSizeFilter.SIZE_200_1000, dataSource1.getId());
results = viewsDAO.getFilesBySize(param, 0, null, false);
results = viewsDAO.getFilesBySize(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Get "200MB - 1GB" files from data source 2
param = new FileTypeSizeSearchParams(FileSizeFilter.SIZE_200_1000, dataSource2.getId());
results = viewsDAO.getFilesBySize(param, 0, null, false);
results = viewsDAO.getFilesBySize(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get "1GB+" files from all data sources
param = new FileTypeSizeSearchParams(FileSizeFilter.SIZE_1000_, null);
results = viewsDAO.getFilesBySize(param, 0, null, false);
results = viewsDAO.getFilesBySize(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Get "50 - 200MB" files from all data sources
param = new FileTypeSizeSearchParams(FileSizeFilter.SIZE_50_200, null);
results = viewsDAO.getFilesBySize(param, 0, null, false);
results = viewsDAO.getFilesBySize(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
} catch (ExecutionException ex) {
@ -802,25 +802,25 @@ public class TableSearchTest extends NbTestCase {
// Get "Tag1" file tags from data source 1
TagsSearchParams param = new TagsSearchParams(knownTag1, TagsSearchParams.TagType.FILE, dataSource1.getId());
SearchResultsDTO results = tagsDAO.getTags(param, 0, null, false);
SearchResultsDTO results = tagsDAO.getTags(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Get "Tag2" file tags from data source 1
param = new TagsSearchParams(tag2, TagsSearchParams.TagType.FILE, dataSource1.getId());
results = tagsDAO.getTags(param, 0, null, false);
results = tagsDAO.getTags(param, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// Get "Tag2" file tags from all data sources
param = new TagsSearchParams(tag2, TagsSearchParams.TagType.FILE, null);
results = tagsDAO.getTags(param, 0, null, false);
results = tagsDAO.getTags(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// Get "Tag1" file tags from data source 2
param = new TagsSearchParams(knownTag1, TagsSearchParams.TagType.FILE, dataSource2.getId());
results = tagsDAO.getTags(param, 0, null, false);
results = tagsDAO.getTags(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -844,19 +844,19 @@ public class TableSearchTest extends NbTestCase {
// Get "Tag1" result tags from data source 2
param = new TagsSearchParams(knownTag1, TagsSearchParams.TagType.RESULT, dataSource2.getId());
results = tagsDAO.getTags(param, 0, null, false);
results = tagsDAO.getTags(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Get "Tag2" result tags from data source 1
param = new TagsSearchParams(tag2, TagsSearchParams.TagType.RESULT, dataSource1.getId());
results = tagsDAO.getTags(param, 0, null, false);
results = tagsDAO.getTags(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get "Tag1" result tags from data source 1
param = new TagsSearchParams(knownTag1, TagsSearchParams.TagType.RESULT, dataSource1.getId());
results = tagsDAO.getTags(param, 0, null, false);
results = tagsDAO.getTags(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -883,19 +883,19 @@ public class TableSearchTest extends NbTestCase {
// Get OS Accounts from data source 1
OsAccountsSearchParams param = new OsAccountsSearchParams(dataSource1.getId());
SearchResultsDTO results = accountsDAO.getAccounts(param, 0, null, false);
SearchResultsDTO results = accountsDAO.getAccounts(param, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// Get OS Accounts from all data sources
param = new OsAccountsSearchParams(null);
results = accountsDAO.getAccounts(param, 0, null, false);
results = accountsDAO.getAccounts(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// Get OS Accounts from data source 1
param = new OsAccountsSearchParams(dataSource2.getId());
results = accountsDAO.getAccounts(param, 0, null, false);
results = accountsDAO.getAccounts(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -928,21 +928,21 @@ public class TableSearchTest extends NbTestCase {
AnalysisResultSearchParam param = new AnalysisResultSearchParam(BlackboardArtifact.Type.TSK_ENCRYPTION_DETECTED, null);
AnalysisResultDAO analysisResultDAO = MainDAO.getInstance().getAnalysisResultDAO();
AnalysisResultTableSearchResultsDTO results = analysisResultDAO.getAnalysisResultsForTable(param, 0, null, false);
AnalysisResultTableSearchResultsDTO results = analysisResultDAO.getAnalysisResultsForTable(param, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_ENCRYPTION_DETECTED, results.getArtifactType());
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// Get encryption detected artifacts from data source 2
param = new AnalysisResultSearchParam(BlackboardArtifact.Type.TSK_ENCRYPTION_DETECTED, dataSource2.getId());
results = analysisResultDAO.getAnalysisResultsForTable(param, 0, null, false);
results = analysisResultDAO.getAnalysisResultsForTable(param, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_ENCRYPTION_DETECTED, results.getArtifactType());
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get all custom artifacts
param = new AnalysisResultSearchParam(customAnalysisResultType, null);
results = analysisResultDAO.getAnalysisResultsForTable(param, 0, null, false);
results = analysisResultDAO.getAnalysisResultsForTable(param, 0, null);
assertEquals(customAnalysisResultType, results.getArtifactType());
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -977,7 +977,7 @@ public class TableSearchTest extends NbTestCase {
// Get the first page
param = new AnalysisResultSearchParam(BlackboardArtifact.Type.TSK_YARA_HIT, null);
results = analysisResultDAO.getAnalysisResultsForTable(param, 0, pageSize, false);
results = analysisResultDAO.getAnalysisResultsForTable(param, 0, pageSize);
assertEquals(ARTIFACT_COUNT_YARA, results.getTotalResultsCount());
assertEquals(pageSize.longValue(), results.getItems().size());
@ -993,7 +993,7 @@ public class TableSearchTest extends NbTestCase {
// Get the second page
param = new AnalysisResultSearchParam(BlackboardArtifact.Type.TSK_YARA_HIT, null);
results = analysisResultDAO.getAnalysisResultsForTable(param, pageSize, pageSize, false);
results = analysisResultDAO.getAnalysisResultsForTable(param, pageSize, pageSize);
assertEquals(ARTIFACT_COUNT_YARA, results.getTotalResultsCount());
assertEquals(ARTIFACT_COUNT_YARA - pageSize, results.getItems().size());
@ -1017,13 +1017,13 @@ public class TableSearchTest extends NbTestCase {
// Test hash set hits
AnalysisResultDAO analysisResultDAO = MainDAO.getInstance().getAnalysisResultDAO();
HashHitSearchParam hashParam = new HashHitSearchParam(null, HASH_SET_1);
AnalysisResultTableSearchResultsDTO results = analysisResultDAO.getAnalysisResultSetHits(hashParam, 0, null, false);
AnalysisResultTableSearchResultsDTO results = analysisResultDAO.getAnalysisResultSetHits(hashParam, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_HASHSET_HIT, results.getArtifactType());
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
hashParam = new HashHitSearchParam(dataSource2.getId(), HASH_SET_1);
results = analysisResultDAO.getAnalysisResultSetHits(hashParam, 0, null, false);
results = analysisResultDAO.getAnalysisResultSetHits(hashParam, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_HASHSET_HIT, results.getArtifactType());
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -1056,13 +1056,13 @@ public class TableSearchTest extends NbTestCase {
// Test keyword set hits
AnalysisResultDAO analysisResultDAO = MainDAO.getInstance().getAnalysisResultDAO();
KeywordHitSearchParam kwParam = new KeywordHitSearchParam(null, KEYWORD_SET_1, "", "");
AnalysisResultTableSearchResultsDTO results = analysisResultDAO.getKeywordHitsForTable(kwParam, 0, null, false);
AnalysisResultTableSearchResultsDTO results = analysisResultDAO.getKeywordHitsForTable(kwParam, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_KEYWORD_HIT, results.getArtifactType());
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
kwParam = new KeywordHitSearchParam(dataSource2.getId(), KEYWORD_SET_1, "", "");
results = analysisResultDAO.getKeywordHitsForTable(kwParam, 0, null, false);
results = analysisResultDAO.getKeywordHitsForTable(kwParam, 0, null);
assertEquals(BlackboardArtifact.Type.TSK_KEYWORD_HIT, results.getArtifactType());
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -1100,43 +1100,43 @@ public class TableSearchTest extends NbTestCase {
// Get all text documents from data source 1
FileTypeExtensionsSearchParams param = new FileTypeExtensionsSearchParams(FileExtRootFilter.TSK_DOCUMENT_FILTER, dataSource1.getId());
SearchResultsDTO results = viewsDAO.getFilesByExtension(param, 0, null, false);
SearchResultsDTO results = viewsDAO.getFilesByExtension(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// Get Word documents from data source 1
param = new FileTypeExtensionsSearchParams(FileExtDocumentFilter.AUT_DOC_OFFICE, dataSource1.getId());
results = viewsDAO.getFilesByExtension(param, 0, null, false);
results = viewsDAO.getFilesByExtension(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get image/jpeg files from data source 1
param = new FileTypeExtensionsSearchParams(FileExtRootFilter.TSK_IMAGE_FILTER, dataSource1.getId());
results = viewsDAO.getFilesByExtension(param, 0, null, false);
results = viewsDAO.getFilesByExtension(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
// Get text documents from all data sources
param = new FileTypeExtensionsSearchParams(FileExtRootFilter.TSK_DOCUMENT_FILTER, null);
results = viewsDAO.getFilesByExtension(param, 0, null, false);
results = viewsDAO.getFilesByExtension(param, 0, null);
assertEquals(4, results.getTotalResultsCount());
assertEquals(4, results.getItems().size());
// Get jpeg files from data source 2
param = new FileTypeExtensionsSearchParams(FileExtRootFilter.TSK_IMAGE_FILTER, dataSource2.getId());
results = viewsDAO.getFilesByExtension(param, 0, null, false);
results = viewsDAO.getFilesByExtension(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Search for file extensions that should produce no results
param = new FileTypeExtensionsSearchParams(CustomRootFilter.EMPTY_RESULT_SET_FILTER, null);
results = viewsDAO.getFilesByExtension(param, 0, null, false);
results = viewsDAO.getFilesByExtension(param, 0, null);
assertEquals(0, results.getTotalResultsCount());
assertEquals(0, results.getItems().size());
// Get the custom file by extension
param = new FileTypeExtensionsSearchParams(CustomRootFilter.CUSTOM_FILTER, null);
results = viewsDAO.getFilesByExtension(param, 0, null, false);
results = viewsDAO.getFilesByExtension(param, 0, null);
assertEquals(1, results.getTotalResultsCount());
assertEquals(1, results.getItems().size());
@ -1161,13 +1161,13 @@ public class TableSearchTest extends NbTestCase {
// There are 4 hosts not associated with a person
FileSystemPersonSearchParam personParam = new FileSystemPersonSearchParam(null);
BaseSearchResultsDTO results = fileSystemDAO.getHostsForTable(personParam, 0, null, false);
BaseSearchResultsDTO results = fileSystemDAO.getHostsForTable(personParam, 0, null);
assertEquals(4, results.getTotalResultsCount());
assertEquals(4, results.getItems().size());
// Person1 is associated with two hosts
personParam = new FileSystemPersonSearchParam(person1.getPersonId());
results = fileSystemDAO.getHostsForTable(personParam, 0, null, false);
results = fileSystemDAO.getHostsForTable(personParam, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
@ -1177,43 +1177,43 @@ public class TableSearchTest extends NbTestCase {
// HostA is associated with two images
FileSystemHostSearchParam hostParam = new FileSystemHostSearchParam(fsTestHostA.getHostId());
results = fileSystemDAO.getContentForTable(hostParam, 0, null, false);
results = fileSystemDAO.getContentForTable(hostParam, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// ImageA has one volume system child, which has three volumes that will be displayed
FileSystemContentSearchParam param = new FileSystemContentSearchParam(fsTestImageA.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// VsA has three volume children (this should match the previous search)
param = new FileSystemContentSearchParam(fsTestVsA.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// VolumeA1 has a file system child, which in turn has a root directory child with three file children
param = new FileSystemContentSearchParam(fsTestVolumeA1.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// FsA has a root directory child with three file children (this should match the previous search)
param = new FileSystemContentSearchParam(fsTestFsA.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// The root dir contains three files
param = new FileSystemContentSearchParam(fsTestRootDirA.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
// ImageB has VS (which will display one volume), pool, and one local file children
param = new FileSystemContentSearchParam(fsTestImageB.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(3, results.getTotalResultsCount());
assertEquals(3, results.getItems().size());
@ -1224,13 +1224,13 @@ public class TableSearchTest extends NbTestCase {
// fsTestVolumeB1 has pool and one local file children
param = new FileSystemContentSearchParam(fsTestVolumeB1.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());
// fsTestPoolB has VS (which will display one volume) and local file children
param = new FileSystemContentSearchParam(fsTestPoolB.getId());
results = fileSystemDAO.getContentForTable(param, 0, null, false);
results = fileSystemDAO.getContentForTable(param, 0, null);
assertEquals(2, results.getTotalResultsCount());
assertEquals(2, results.getItems().size());