Changes to structure of test_data directory log2timeline#4798 (log2ti…

…meline#4844)
joachimmetz · Mar 24, 2024 · e773532 · e773532
1 parent 92a1b5c
commit e773532
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 16 deletions.
diff --git a/...1b4dd67f29cb1962.automaticDestinations-ms → ...1b4dd67f29cb1962.automaticDestinations-ms b/...1b4dd67f29cb1962.automaticDestinations-ms → ...1b4dd67f29cb1962.automaticDestinations-ms
diff --git a/...9d1f905ce5044aee.automaticDestinations-ms → ...9d1f905ce5044aee.automaticDestinations-ms b/...9d1f905ce5044aee.automaticDestinations-ms → ...9d1f905ce5044aee.automaticDestinations-ms
diff --git a/test_data/bodyfile → test_data/bodyfile/bodyfile b/test_data/bodyfile → test_data/bodyfile/bodyfile
diff --git a/test_data/bodyfile.corrupt → test_data/bodyfile/bodyfile.corrupt b/test_data/bodyfile.corrupt → test_data/bodyfile/bodyfile.corrupt
diff --git a/test_data/History → test_data/chrome_history/History b/test_data/History → test_data/chrome_history/History
diff --git a/test_data/History-57.0.2987.133 → ...data/chrome_history/History-57.0.2987.133 b/test_data/History-57.0.2987.133 → ...data/chrome_history/History-57.0.2987.133
diff --git a/test_data/History-58.0.3029.96 → ..._data/chrome_history/History-58.0.3029.96 b/test_data/History-58.0.3029.96 → ..._data/chrome_history/History-58.0.3029.96
diff --git a/test_data/History-59.0.3071.86 → ..._data/chrome_history/History-59.0.3071.86 b/test_data/History-59.0.3071.86 → ..._data/chrome_history/History-59.0.3071.86
diff --git a/test_data/History-59_added-fake-column → ...rome_history/History-59_added-fake-column b/test_data/History-59_added-fake-column → ...rome_history/History-59_added-fake-column
diff --git a/test_data/firefox_10_cookies.sqlite → ...firefox_cookies/firefox_10_cookies.sqlite b/test_data/firefox_10_cookies.sqlite → ...firefox_cookies/firefox_10_cookies.sqlite
diff --git a/test_data/firefox_2_cookies.sqlite → .../firefox_cookies/firefox_2_cookies.sqlite b/test_data/firefox_2_cookies.sqlite → .../firefox_cookies/firefox_2_cookies.sqlite
diff --git a/test_data/places.sqlite → test_data/firefox_history/places.sqlite b/test_data/places.sqlite → test_data/firefox_history/places.sqlite
diff --git a/test_data/places_new.sqlite → test_data/firefox_history/places_new.sqlite b/test_data/places_new.sqlite → test_data/firefox_history/places_new.sqlite
diff --git a/test_data/macos_launchd.log b/test_data/macos_launchd.log
diff --git a/test_data/syslog_rsyslog_ForwardFormat → ..._data/syslog/syslog_rsyslog_ForwardFormat b/test_data/syslog_rsyslog_ForwardFormat → ..._data/syslog/syslog_rsyslog_ForwardFormat
diff --git a/...a/syslog_rsyslog_TraditionalForwardFormat → ...g/syslog_rsyslog_TraditionalForwardFormat b/...a/syslog_rsyslog_TraditionalForwardFormat → ...g/syslog_rsyslog_TraditionalForwardFormat
diff --git a/tests/analysis/browser_search.py b/tests/analysis/browser_search.py
@@ -20,7 +20,8 @@ def testExamineEventAndCompileReport(self):
     parser = sqlite.SQLiteParser()
     plugin = browser_search.BrowserSearchPlugin()
 
-    storage_writer = self._ParseAndAnalyzeFile(['History'], parser, plugin)
+    storage_writer = self._ParseAndAnalyzeFile(
+        ['chrome_history', 'History'], parser, plugin)
 
     analysis_results = list(storage_writer.GetAttributeContainers(
         'browser_search_analysis_result'))

diff --git a/tests/lib/line_reader_file.py b/tests/lib/line_reader_file.py
@@ -120,7 +120,7 @@ def testReadlinesWithSizeHint(self):
 
   def testReadlinesWithFileWithoutNewLineAtEnd(self):
     """Test reading lines from a file without a new line char at the end."""
-    test_file_path = self._GetTestFilePath(['bodyfile'])
+    test_file_path = self._GetTestFilePath(['bodyfile', 'bodyfile'])
     self._SkipIfPathNotExists(test_file_path)
 
     test_path_spec = os_path_spec.OSPathSpec(location=test_file_path)

diff --git a/tests/parsers/bodyfile.py b/tests/parsers/bodyfile.py
@@ -15,7 +15,7 @@ class BodyfileTest(test_lib.ParserTestCase):
   def testParse(self):
     """Tests the Parse function."""
     parser = bodyfile.BodyfileParser()
-    storage_writer = self._ParseFile(['bodyfile'], parser)
+    storage_writer = self._ParseFile(['bodyfile', 'bodyfile'], parser)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')
@@ -50,7 +50,7 @@ def testParse(self):
   def testParseOnCorruptFile(self):
     """Tests the Parse function on a corrupt bodyfile."""
     parser = bodyfile.BodyfileParser()
-    storage_writer = self._ParseFile(['bodyfile.corrupt'], parser)
+    storage_writer = self._ParseFile(['bodyfile', 'bodyfile.corrupt'], parser)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')

diff --git a/tests/parsers/cookie_plugins/ganalytics.py b/tests/parsers/cookie_plugins/ganalytics.py
@@ -18,7 +18,7 @@ def testParsingFirefox29CookieDatabase(self):
     """Tests the Process function on a Firefox 29 cookie database file."""
     plugin = firefox_cookies.FirefoxCookie2Plugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['firefox_2_cookies.sqlite'], plugin)
+        ['firefox_cookies', 'firefox_2_cookies.sqlite'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')

diff --git a/tests/parsers/olecf_plugins/automatic_destinations.py b/tests/parsers/olecf_plugins/automatic_destinations.py
@@ -16,7 +16,8 @@ def testProcessVersion1(self):
     """Tests the Process function on version 1 .automaticDestinations-ms."""
     plugin = automatic_destinations.AutomaticDestinationsOLECFPlugin()
     storage_writer = self._ParseOLECFFileWithPlugin(
-        ['1b4dd67f29cb1962.automaticDestinations-ms'], plugin)
+        ['automatic_destinations', '1b4dd67f29cb1962.automaticDestinations-ms'],
+        plugin)
 
     # Number of events:
     # olecf:dest_list:entry: 11
@@ -86,7 +87,8 @@ def testProcessVersion3(self):
     """Tests the Process function on version 3 .automaticDestinations-ms."""
     plugin = automatic_destinations.AutomaticDestinationsOLECFPlugin()
     storage_writer = self._ParseOLECFFileWithPlugin(
-        ['9d1f905ce5044aee.automaticDestinations-ms'], plugin)
+        ['automatic_destinations', '9d1f905ce5044aee.automaticDestinations-ms'],
+        plugin)
 
     # Event data types:
     # olecf:dest_list:entry: 2

diff --git a/tests/parsers/sqlite_plugins/chrome_history.py b/tests/parsers/sqlite_plugins/chrome_history.py
@@ -16,7 +16,7 @@ def testProcess(self):
     """Tests the Process function on a Chrome History database file."""
     plugin = chrome_history.GoogleChrome8HistoryPlugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['History'], plugin)
+        ['chrome_history', 'History'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')
@@ -65,7 +65,7 @@ def testProcess57(self):
     """Tests the Process function on a Google Chrome 57 History database."""
     plugin = chrome_history.GoogleChrome27HistoryPlugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['History-57.0.2987.133'], plugin)
+        ['chrome_history', 'History-57.0.2987.133'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')
@@ -114,7 +114,7 @@ def testProcess58(self):
     """Tests the Process function on a Google Chrome 58 History database."""
     plugin = chrome_history.GoogleChrome27HistoryPlugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['History-58.0.3029.96'], plugin)
+        ['chrome_history', 'History-58.0.3029.96'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')
@@ -163,7 +163,7 @@ def testProcess59(self):
     """Tests the Process function on a Google Chrome 59 History database."""
     plugin = chrome_history.GoogleChrome27HistoryPlugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['History-59.0.3071.86'], plugin)
+        ['chrome_history', 'History-59.0.3071.86'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')
@@ -215,7 +215,7 @@ def testProcess59ExtraColumn(self):
     """
     plugin = chrome_history.GoogleChrome27HistoryPlugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['History-59_added-fake-column'], plugin)
+        ['chrome_history', 'History-59_added-fake-column'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')

diff --git a/tests/parsers/sqlite_plugins/firefox_cookies.py b/tests/parsers/sqlite_plugins/firefox_cookies.py
@@ -16,7 +16,7 @@ def testProcess(self):
     """Tests the Process function."""
     plugin = firefox_cookies.FirefoxCookie2Plugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['firefox_2_cookies.sqlite'], plugin)
+        ['firefox_cookies', 'firefox_2_cookies.sqlite'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')
@@ -52,7 +52,7 @@ def testProcess(self):
     """Tests the Process function."""
     plugin = firefox_cookies.FirefoxCookie10Plugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['firefox_10_cookies.sqlite'], plugin)
+        ['firefox_cookies', 'firefox_10_cookies.sqlite'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')

diff --git a/tests/parsers/sqlite_plugins/firefox_history.py b/tests/parsers/sqlite_plugins/firefox_history.py
@@ -17,7 +17,7 @@ def testProcessPriorTo24(self):
     # This is probably version 23 but potentially an older version.
     plugin = firefox_history.FirefoxHistoryPlugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['places.sqlite'], plugin)
+        ['firefox_history', 'places.sqlite'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')
@@ -89,7 +89,7 @@ def testProcessVersion25(self):
     """Tests the Process function on a Firefox History database file v 25."""
     plugin = firefox_history.FirefoxHistoryPlugin()
     storage_writer = self._ParseDatabaseFileWithPlugin(
-        ['places_new.sqlite'], plugin)
+        ['firefox_history', 'places_new.sqlite'], plugin)
 
     number_of_event_data = storage_writer.GetNumberOfAttributeContainers(
         'event_data')