566 Commits

Author SHA1 Message Date
Brian Sweeney
d8093fd690 Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3868-normalize-cr 2018-08-05 21:46:03 -06:00
Brian Sweeney
02c340fae9 Merge branch 'develop' of https://github.com/briangsweeney/autopsy into commonfiles 2018-08-05 21:22:56 -06:00
Richard Cordovano
53990be2e4
Merge pull request #3931 from zhhl/3964-testZipBomb
3964: Functional test that tests flag for zip bomb
2018-08-03 14:00:31 -04:00
Brian Sweeney
547c981445 Merge branch '4070_remove_db_methods' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/IntraCasePanel.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-08-03 10:58:15 -06:00
Richard Cordovano
7a60aba429
Revert "Revert "4072 remove cache"" 2018-08-03 11:15:28 -04:00
Richard Cordovano
cde3d8dd1f
Revert "4072 remove cache" 2018-08-03 11:03:02 -04:00
Brian Sweeney
cb7d290265 comments 2018-08-03 08:47:06 -06:00
Brian Sweeney
c63c85b0db cleanup 2018-08-02 21:29:53 -06:00
Brian Sweeney
6164dead35 client updated to account for validation failures, tests updated to account for new sorts of failures, null check added to validator 2018-08-02 21:24:48 -06:00
William Schaefer
21fc9a67a9 3964 adjust failure messages for zip bomb test to give more context 2018-08-02 16:08:21 -04:00
Brian Sweeney
761273608e updating tests of client code 2018-08-02 13:58:45 -06:00
Brian Sweeney
11dea2acf7 various errors with tests 2018-08-02 13:54:05 -06:00
William Schaefer
aec96c0ea3 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3964-testZipBomb-Rev2 2018-08-02 14:39:42 -04:00
William Schaefer
74bf4bd272 3964 - change name of new image to reflect naming schema in 3771 2018-08-02 14:14:24 -04:00
Brian Sweeney
ca9709b781 tests 2018-08-01 16:40:07 -06:00
Brian Sweeney
4fe257b82d public access for testable methods, bad md5 hash, wasnt actually bad, regex was made more permissive (supports mixed case) 2018-08-01 10:54:03 -06:00
Brian Sweeney
0199865b29 some test vars 2018-07-30 15:59:14 -06:00
Brian Sweeney
1e379b0882 test code added, stub code 2018-07-30 11:00:32 -06:00
Brian Sweeney
b570830d1b need to check for existance of eamdb before trying getinstance 2018-07-26 17:32:54 -06:00
Brian Sweeney
441230d3e9 and the tests are fixed 2018-07-26 17:19:23 -06:00
Andrew Ziehl
5bad6cff78 Cleanup and add tests, add null check. 2018-07-26 12:57:24 -07:00
Andrew Ziehl
c93ab554c9 Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-07-25 14:25:04 -07:00
Andrew Ziehl
e2a5a17746 fix merge conflict of test removal 2018-07-25 14:23:53 -07:00
Brian Sweeney
80feccdbca comments and cleanup 2018-07-25 14:57:40 -06:00
Brian Sweeney
92cf85efa3 this test is obsolete 2018-07-25 14:55:00 -06:00
Brian Sweeney
948bd3d2b3 git screwed this up 2018-07-25 14:54:46 -06:00
Brian Sweeney
cc34a759b4 Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge 2018-07-25 13:34:54 -06:00
Brian Sweeney
188d63ea72 test cases for intercase correlation 2018-07-25 10:50:55 -06:00
Andrew Ziehl
672d1eea02 Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/centralrepository/datamodel/CentralRepoDatamodelTest.java
2018-07-24 15:50:53 -07:00
Brian Sweeney
0468b6bd59 base case functioning correctly 2018-07-24 16:17:26 -06:00
Brian Sweeney
25f7cc5ef5 may still need this variable? 2018-07-24 13:58:18 -06:00
Brian Sweeney
8e7825de5f cleanup 2018-07-24 13:56:45 -06:00
Brian Sweeney
a758fbe779 comment out broken stuff for the moment 2018-07-24 12:42:52 -06:00
Andrew Ziehl
944758225b Merge branch '3788-intercase-intracase-merge' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge 2018-07-24 11:29:29 -07:00
Andrew Ziehl
d71bfe99fe Remove for loop, add md5 qualifier to AbstractFile lookup 2018-07-24 11:26:38 -07:00
Brian Sweeney
88ab16833d rename some stuff for clarity 2018-07-24 11:57:30 -06:00
Brian Sweeney
fd2d9908f5 renaming 2018-07-24 08:43:55 -06:00
Brian Sweeney
a65e43d112 more merge conflicts 2018-07-23 16:15:09 -06:00
Brian Sweeney
d8b4fc878e Merge branch 'commonfiles' of https://github.com/briangsweeney/autopsy into 3788-intercase-intracase-merge
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResultRootNode.java
#	Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonAttributeSearchResults.java
#	Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/InterCaseUtils.java
2018-07-23 15:28:10 -06:00
Brian Sweeney
a3d03fa0ba test utils and access modifiers required for testing 2018-07-23 15:10:08 -06:00
Brian Carrier
23a487c190 minor refactor 2018-07-23 14:06:49 -04:00
Brian Carrier
5fad7ae67b minor refactor. No logic changes 2018-07-23 12:55:04 -04:00
Brian Sweeney
9d04ef439e names/comments 2018-07-23 10:38:30 -06:00
Brian Sweeney
2258e368b3 merge/refactor de-conflicting 2018-07-21 18:11:32 -06:00
Brian Sweeney
2e0b1e0dca these did not merge well 2018-07-21 10:16:38 -06:00
Brian Sweeney
f2c97b8079 cleanup 2018-07-21 09:46:54 -06:00
Brian Sweeney
8c9d03ec60 work in progress 2018-07-21 09:41:28 -06:00
Brian Sweeney
1e84766419 these were deleted and i think it was a mistake 2018-07-19 11:52:40 -06:00
Brian Sweeney
7df457b5e3 polish 2018-07-19 11:02:33 -06:00
millmanorama
d0e71951cf Merge remote-tracking branch 'upstream/develop' into timeline-event-mgr
# Conflicts:
#	Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestModule.java
#	Core/src/org/sleuthkit/autopsy/modules/iOS/ContactAnalyzer.java
#	Core/src/org/sleuthkit/autopsy/timeline/PerCaseTimelineProperties.java
#	Core/src/org/sleuthkit/autopsy/timeline/filters/TagNameFilter.java
2018-07-19 12:44:32 +02:00