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

fixed regression.py

Browse Source
This commit is contained in:
Sean-M 2013-03-11 12:32:37 -04:00
parent 0d6b9d6f77
commit 44c70e33b4
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
View File

@ -150,7 +150,7 @@ public abstract class KeywordSearchListsAbstract {
} }
List<KeywordSearchList> getListsL() { public List<KeywordSearchList> getListsL() {
List<KeywordSearchList> ret = new ArrayList<KeywordSearchList>(); List<KeywordSearchList> ret = new ArrayList<KeywordSearchList>();
for (KeywordSearchList list : theLists.values()) { for (KeywordSearchList list : theLists.values()) {
ret.add(list); ret.add(list);
@ -158,7 +158,7 @@ public abstract class KeywordSearchListsAbstract {
return ret; return ret;
} }
List<KeywordSearchList> getListsL(boolean locked) { public List<KeywordSearchList> getListsL(boolean locked) {
List<KeywordSearchList> ret = new ArrayList<KeywordSearchList>(); List<KeywordSearchList> ret = new ArrayList<KeywordSearchList>();
for (KeywordSearchList list : theLists.values()) { for (KeywordSearchList list : theLists.values()) {
if (list.isLocked().equals(locked)) { if (list.isLocked().equals(locked)) {
@ -173,7 +173,7 @@ public abstract class KeywordSearchListsAbstract {
* *
* @return List of keyword list names * @return List of keyword list names
*/ */
List<String> getListNames() { public List<String> getListNames() {
return new ArrayList<String>(theLists.keySet()); return new ArrayList<String>(theLists.keySet());
} }
@ -183,7 +183,7 @@ public abstract class KeywordSearchListsAbstract {
* @param locked true if look for locked lists, false otherwise * @param locked true if look for locked lists, false otherwise
* @return List of keyword list names * @return List of keyword list names
*/ */
List<String> getListNames(boolean locked) { public List<String> getListNames(boolean locked) {
ArrayList<String> lists = new ArrayList<String>(); ArrayList<String> lists = new ArrayList<String>();
for (String listName : theLists.keySet()) { for (String listName : theLists.keySet()) {
KeywordSearchList list = theLists.get(listName); KeywordSearchList list = theLists.get(listName);
@ -201,7 +201,7 @@ public abstract class KeywordSearchListsAbstract {
* @param keyword * @param keyword
* @return found list or null * @return found list or null
*/ */
KeywordSearchList getListWithKeyword(Keyword keyword) { public KeywordSearchList getListWithKeyword(Keyword keyword) {
KeywordSearchList found = null; KeywordSearchList found = null;
for (KeywordSearchList list : theLists.values()) { for (KeywordSearchList list : theLists.values()) {
if (list.hasKeyword(keyword)) { if (list.hasKeyword(keyword)) {
@ -218,7 +218,7 @@ public abstract class KeywordSearchListsAbstract {
* @param keyword * @param keyword
* @return found list or null * @return found list or null
*/ */
KeywordSearchList getListWithKeyword(String keyword) { public KeywordSearchList getListWithKeyword(String keyword) {
KeywordSearchList found = null; KeywordSearchList found = null;
for (KeywordSearchList list : theLists.values()) { for (KeywordSearchList list : theLists.values()) {
if (list.hasKeyword(keyword)) { if (list.hasKeyword(keyword)) {
@ -244,7 +244,7 @@ public abstract class KeywordSearchListsAbstract {
* @param locked true if look for locked lists, false otherwise * @param locked true if look for locked lists, false otherwise
* @return number of unlocked lists currently stored * @return number of unlocked lists currently stored
*/ */
int getNumberLists(boolean locked) { public int getNumberLists(boolean locked) {
int numLists = 0; int numLists = 0;
for (String listName : theLists.keySet()) { for (String listName : theLists.keySet()) {
KeywordSearchList list = theLists.get(listName); KeywordSearchList list = theLists.get(listName);
@ -261,7 +261,7 @@ public abstract class KeywordSearchListsAbstract {
* @param name id of the list * @param name id of the list
* @return keyword list representation * @return keyword list representation
*/ */
KeywordSearchList getList(String name) { public KeywordSearchList getList(String name) {
return theLists.get(name); return theLists.get(name);
} }
@ -477,19 +477,19 @@ public abstract class KeywordSearchListsAbstract {
return hash; return hash;
} }
String getName() { public String getName() {
return name; return name;
} }
Date getDateCreated() { public Date getDateCreated() {
return created; return created;
} }
Date getDateModified() { public Date getDateModified() {
return modified; return modified;
} }
Boolean getUseForIngest() { public Boolean getUseForIngest() {
return useForIngest; return useForIngest;
} }
@ -497,7 +497,7 @@ public abstract class KeywordSearchListsAbstract {
this.useForIngest = use; this.useForIngest = use;
} }
Boolean getIngestMessages() { public Boolean getIngestMessages() {
return ingestMessages; return ingestMessages;
} }
@ -505,7 +505,7 @@ public abstract class KeywordSearchListsAbstract {
this.ingestMessages = ingestMessages; this.ingestMessages = ingestMessages;
} }
List<Keyword> getKeywords() { public List<Keyword> getKeywords() {
return keywords; return keywords;
} }
@ -513,7 +513,7 @@ public abstract class KeywordSearchListsAbstract {
return keywords.contains(keyword); return keywords.contains(keyword);
} }
boolean hasKeyword(String keyword) { public boolean hasKeyword(String keyword) {
//note, this ignores isLiteral //note, this ignores isLiteral
for (Keyword k : keywords) { for (Keyword k : keywords) {
if (k.getQuery().equals(keyword)) { if (k.getQuery().equals(keyword)) {
@ -523,7 +523,7 @@ public abstract class KeywordSearchListsAbstract {
return false; return false;
} }
Boolean isLocked() { public Boolean isLocked() {
return locked; return locked;
} }
} }

4
Testing/script/regression.py
View File

@ -851,8 +851,10 @@ def compare_errors():
common_dat = common_log.read() common_dat = common_log.read()
patrn = re.compile("\d") patrn = re.compile("\d")
if (re.sub(patrn, 'd', gold_dat) != re.sub(patrn, 'd', common_dat)): if (re.sub(patrn, 'd', gold_dat) != re.sub(patrn, 'd', common_dat)):
print(re.sub(patrn, 'd', gold_dat))
print(re.sub(patrn, 'd', common_dat))
diff_dir = make_local_path(case.output_dir, case.image_name, "ErrorDiff.txt") diff_dir = make_local_path(case.output_dir, case.image_name, "ErrorDiff.txt")
diff_file = open(diff_dir, "w") diff_file = open(diff_dir, "w")
dffcmdlst = ["diff", case.sorted_log, gold_dir] dffcmdlst = ["diff", case.sorted_log, gold_dir]
subprocess.call(dffcmdlst, stdout = diff_file) subprocess.call(dffcmdlst, stdout = diff_file)
global attachl global attachl