566 Commits

Author SHA1 Message Date
Brian Sweeney
6a4f612e87 more test code 2018-09-05 16:39:57 -06:00
Brian Sweeney
169bfcfe9d test code 2018-09-05 16:14:56 -06:00
Brian Sweeney
385deb411c test code 2018-09-05 15:46:27 -06:00
Brian Sweeney
7b3c4ab7a7 tests updated 2018-08-31 17:01:27 -06:00
Brian Sweeney
8ef34cb4d6 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 4121_correlation_types
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/Bundle.properties
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.form
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleInterCaseCommonAttributeSearcher.java
2018-08-31 15:08:59 -06:00
Andrew Ziehl
56156cc7b9 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3870-pure-callable
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResults.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseTestUtils.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
2018-08-29 08:56:55 -07:00
Andrew Ziehl
ea29efccf3 Address PR feedback 2018-08-28 13:24:03 -07:00
Andrew Ziehl
c113844a3c rename findFiles() to findMatches() since it's more type agnostic. Add code comments. 2018-08-28 11:57:12 -07:00
Brian Sweeney
e24aed2e56 bad test code 2018-08-28 08:47:48 -06:00
Brian Sweeney
03d0254506 trying to appease codacy 2018-08-28 07:52:43 -06:00
Andrew Ziehl
dc8749d000 Add combobox to intercasePanel. Wire up typing. 2018-08-27 15:31:01 -07:00
Andrew Ziehl
8d847415a2 Merge branch '4102-filter-by-frequency' of https://github.com/briangsweeney/autopsy into 4121_correlation_types
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/AllInterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributePanel.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCaseCommonAttributeSearcher.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/SingleInterCaseCommonAttributeSearcher.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IngestedWithHashAndFileTypeInterCaseTests.java
2018-08-27 15:13:35 -07:00
Brian Sweeney
aa8feb64bb codacy stuff 2018-08-27 14:32:12 -06:00
Brian Sweeney
6681accdc7 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4102-filter-by-frequency
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseTestUtils.java
2018-08-27 13:46:02 -06:00
Brian Sweeney
d77ff585b9 dummy hash values replaced with things which will actually pass normalization, exception handling revised to reflect presence of correlationattributenormalizationexception 2018-08-27 12:36:24 -06:00
Brian Sweeney
0517b4654c usbid tests are basically disabled for now 2018-08-27 12:35:12 -06:00
Brian Sweeney
c829b57ec9 first pass at fixing all the merge conflicts 2018-08-24 17:18:59 -06:00
Andrew Ziehl
cf8af26327 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 4121_correlation_types
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CentralRepoCommonAttributeInstance.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
2018-08-24 12:59:08 -07:00
Brian Sweeney
33837e8d18 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr
# Conflicts:
#	Core/nbproject/project.xml
#	Core/src/org/sleuthkit/autopsy/centralrepository/AddEditCentralRepoCommentAction.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeInstanceData.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttribute.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamDb.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/SqliteEamDb.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
#	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbManager.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-08-24 09:00:44 -06:00
Brian Sweeney
cebb79822e validation modifications and test code modifications 2018-08-23 17:53:21 -06:00
Brian Carrier
932832d9bb
Merge pull request #4055 from briangsweeney/3863_remove_correlationattribute
3863 remove correlationattribute
2018-08-23 15:28:14 -04:00
Andrew Ziehl
20e0cf6dbd Backend logic changes to incorporate multiple CR types based on yet-to-be implemented UI selection. Decided to pass type into existing classes rather than create new extension classes, for simplicity. 2018-08-23 12:12:24 -07:00
Brian Sweeney
e70fc3210c assertion api changed slightly 2018-08-23 10:47:12 -06:00
Andrew Ziehl
e405c3ab98 Address codeacy, remove TODOs from code. 2018-08-23 09:05:10 -07:00
Brian Sweeney
5a2b9c924d Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 4102-filter-by-frequency 2018-08-23 08:06:57 -06:00
Andrew Ziehl
a47979ee65 Code review cleanup, codeacy issue fixes. 2018-08-22 17:51:00 -07:00
Brian Sweeney
ac31962c95 frequency search tests 2018-08-22 17:20:34 -06:00
Brian Sweeney
4a68eb7e57 updated comments with info pertinent to frequency search tests 2018-08-22 17:19:42 -06:00
Brian Sweeney
92605055b5 typo in tests 2018-08-22 08:34:15 -06:00
Brian Sweeney
2c32fe42e8 fixed all the tests 2018-08-21 17:03:33 -06:00
Andrew Ziehl
ff64c74c5e Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3863_remove_correlationattribute
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.form
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeData.java
2018-08-17 10:38:40 -07:00
Andrew Ziehl
38a3b1604e test fix 2018-08-17 10:07:03 -07:00
Andrew Ziehl
6d5c5662da fix normalization discrepancies causing tests to fail. may conflict with. 3868 2018-08-16 14:51:33 -07:00
rishwanth1995
1aea3198cf replaced python asserts with junut asserts 2018-08-16 16:47:44 -04:00
Andrew Ziehl
2b4059a613 Add fields to DB returns to properly create CorrelationAttributeInstances 2018-08-15 16:54:26 -07:00
Andrew Ziehl
a3eb28f1dc update tests for instance refactor. 2018-08-15 16:38:18 -07:00
Brian Sweeney
66e97f8349 codacy stuff 2018-08-14 10:59:10 -06:00
Brian Sweeney
385222ef2c must convert to lower since thats what the normalizer does 2018-08-14 09:05:23 -06:00
Brian Sweeney
b4bd847d5e Merge branch 'develop' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr 2018-08-13 08:45:45 -06:00
Andrew Ziehl
bf28dbb83d first pass, almost done to no build errors. 2018-08-10 14:45:09 -07:00
Brian Sweeney
ba55eecccc more codacy things 2018-08-10 08:42:44 -06:00
Brian Sweeney
ac096fac57 codacy stuff 2018-08-09 17:41:10 -06:00
Brian Sweeney
7559a45a7c added phone normalization and renamed the whole thing 2018-08-09 16:48:09 -06:00
millmanorama
1aec7c0ae8 Merge remote-tracking branch 'upstream/develop' into move_ui_code_out_of_tsk
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/casemodule/services/Blackboard.java
#	Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java
#	Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbIngestModule.java
2018-08-09 17:10:42 +02:00
Brian Sweeney
49e53f4780 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3868-normalize-cr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrenceNodeData.java
2018-08-07 17:43:27 -06:00
Brian Sweeney
bf2d2be90d Merge branch 'develop' of https://github.com/briangsweeney/autopsy into commonfiles 2018-08-07 12:33:56 -06:00
Brian Sweeney
55b171c135 bugs in test code 2018-08-07 11:59:18 -06:00
Brian Sweeney
9d0c90f83f tests update centralrepovalidator and eamdb that throws exceptions and leaves handling to clients 2018-08-07 08:30:47 -06:00
Brian Sweeney
eb5a7f13b3 remove python libs 2018-08-06 16:41:52 -06:00
Brian Sweeney
2541927897 Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr
# Conflicts:
#	Core/nbproject/project.xml
#	Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
#	Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java
2018-08-06 10:25:30 -06:00