From ad36c29f0bd74fac9bed66cf06b372776a28814c Mon Sep 17 00:00:00 2001
From: Sean-M <Smoss117@gmail.com>
Date: Wed, 13 Feb 2013 14:46:03 -0500
Subject: [PATCH] Fixes to Mac test
---
.../Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt | 2 +-
.../Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt | 2 +-
.../test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt | 2 +-
.../Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt | 2 +-
.../java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt | 2 +-
.../test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt | 2 +-
bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt | 2 +-
.../test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt | 2 +-
.../java/test/org/sleuthkit/datamodel/SequentialTraversal.java | 2 +-
.../java/test/org/sleuthkit/datamodel/TopDownTraversal.java | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt
index 7b3b54a98..e4e5a4b69 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000004 name vol2 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol2 getParent 2] Volume [ addr 2 desc DOS FAT16 (0x04) flags 1 length 60749 start 51]
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt
index 7b3b54a98..e4e5a4b69 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_SequentialTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000004 name vol2 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol2 getParent 2] Volume [ addr 2 desc DOS FAT16 (0x04) flags 1 length 60749 start 51]
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt
index 910598df8..ad13600c5 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000069 name Unalloc_3_0_26112 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1/Unalloc_3_0_26112 getParent 3] AbstractFile [ type UNALLOC_BLOCKS isDir false isFile true isRoot false isVirtual true] LayoutFile [ ]
diff --git a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt
index 7b3b54a98..e4e5a4b69 100644
--- a/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/nps-2009-canon2-gen5_TopDownTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\nps-2009-canon2-gen5.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name nps-2009-canon2-gen5.raw uniquePath /img_nps-2009-canon2-gen5.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_nps-2009-canon2-gen5.raw getParent 1] VolumeSystem [ blockSize 512 imgOffset 0 type 1]
AbstractContent [ objId 0000000003 name vol1 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol1 getParent 2] Volume [ addr 1 desc Unallocated flags 2 length 51 start 0]
AbstractContent [ objId 0000000004 name vol2 getUniquePath /img_nps-2009-canon2-gen5.raw/vol_vol2 getParent 2] Volume [ addr 2 desc DOS FAT16 (0x04) flags 1 length 60749 start 51]
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt
index 133674d62..81c8b510a 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt
index 133674d62..81c8b510a 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_SequentialTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt
index 2b2e6b390..519c0b7d5 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt
index 133674d62..81c8b510a 100644
--- a/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt
+++ b/bindings/java/test/Output/Gold/ntfs1-gen2_TopDownTraversal_Sorted.txt
@@ -1,4 +1,4 @@
-AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ paths [C:\Users\smoss\Documents\GitHub\sleuthkit\bindings\java\test\input\ntfs1-gen2.raw] size 0 ssize 512 timezone type 1]
+AbstractContent [ objId 0000000001 name ntfs1-gen2.raw uniquePath /img_ntfs1-gen2.raw parentId -1] Image [ size 0 ssize 512 timezone type 1]
AbstractContent [ objId 0000000002 name getUniquePath /img_ntfs1-gen2.raw getParent 1] FileSystem [ blockCount 1008895 blockSize 512 firstInum 0 fsType TSK_FS_TYPE_NTFS imgOffset 0 lastInum 96 rootInum 5 ]
AbstractContent [ objId 0000000003 name getUniquePath /img_ntfs1-gen2.raw/ getParent 2] AbstractFile [ type FS isDir true isFile false isRoot true isVirtual false] FsContent [ crtime 1230763442 mtime 1231191948 atime 1231271053 attrId 6 dirFlag Allocated dirType DIR fsObjId 2 gid 0 metaAddr 5 metaFlags [Allocated, Used] metaType d modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 56 uid 48 uniquePath /img_ntfs1-gen2.raw/] Directory [ ]
AbstractContent [ objId 0000000004 name $AttrDef getUniquePath /img_ntfs1-gen2.raw/$AttrDef getParent 3] AbstractFile [ type FS isDir false isFile true isRoot false isVirtual false] FsContent [ crtime 1230763442 mtime 1230763442 atime 1230763442 attrId 4 dirFlag Allocated dirType REG fsObjId 2 gid 0 metaAddr 4 metaFlags [Allocated, Used] metaType r modes [TSK_FS_META_MODE_IRUSR, TSK_FS_META_MODE_IXUSR, TSK_FS_META_MODE_IRGRP, TSK_FS_META_MODE_IXGRP, TSK_FS_META_MODE_IROTH, TSK_FS_META_MODE_IXOTH] parentPath / size 2560 uid 48 uniquePath /img_ntfs1-gen2.raw/$AttrDef] File [ ] md5=d9d282989870954e69117c3fa4888929
diff --git a/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java b/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java
index dd2b60756..0827f1853 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/SequentialTraversal.java
@@ -94,7 +94,7 @@ public FileWriter traverse(SleuthkitCase sk, String path) {
Content c;
try {
while ((c = sk.getContentById(x)) != null) {
- reslt.append(((AbstractContent) c).toString(false));
+ reslt.append(((AbstractContent) c).toString(false).replaceAll("paths \\[([A-z]:)?.+?\\]", ""));
if (c instanceof File) {
DataModelTestSuite.readContent(c, reslt, exFile);
}
diff --git a/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java b/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java
index cbdcc35c8..ff43ba3ae 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java
@@ -119,7 +119,7 @@ public FileWriter traverse(SleuthkitCase sk, String path) {
private void topDownDF(List<Content> lc, List<Long> lp, Appendable reslt, Appendable levs) {
for (Content c : lc) {
try {
- reslt.append(((AbstractContent) c).toString(false));
+ reslt.append(((AbstractContent) c).toString(false).replaceAll("paths \\[([A-z]:)?.+?\\]", ""));
} catch (IOException ex) {
logg.log(Level.SEVERE, "Failed to Traverse", ex);
}
--
GitLab