Remove filter_ts_* global variables

Replaces them with $dateFrom and $dateTo variables.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

1 files changed, 20 insertions, 26 deletions

diff --git a/test/classes/TrackingTest.php b/test/classes/TrackingTest.php
index c677bfd342..ab350834ec 100644
--- a/test/classes/TrackingTest.php
+++ b/test/classes/TrackingTest.php
@@ -65,21 +65,19 @@ class TrackingTest extends AbstractTestCase
     {
         $data = [
             [
-                'date' => '20120102',
+                'date' => '2012-01-01 12:34:56',
                 'username' => 'username1',
                 'statement' => 'statement1',
             ],
             [
-                'date' => '20130102',
+                'date' => '2013-01-01 12:34:56',
                 'username' => 'username2',
                 'statement' => 'statement2',
             ],
         ];
-        $filter_ts_from = 0;
-        $filter_ts_to = 999999999999;
         $filter_users = ['username1'];
 
-        $ret = $this->tracking->filter($data, $filter_ts_from, $filter_ts_to, $filter_users);
+        $ret = $this->tracking->filter($data, $filter_users, '2010-01-01 12:34:56', '2020-01-01 12:34:56');
 
         $this->assertEquals('username1', $ret[0]['username']);
         $this->assertEquals('statement1', $ret[0]['statement']);
@@ -274,16 +272,12 @@ class TrackingTest extends AbstractTestCase
             'dmlog' => [['date' => '2022-11-02 22:15:24']],
         ];
         $url_params = [];
-        $filter_ts_to = 0;
-        $filter_ts_from = 0;
         $filter_users = [];
 
         $html = $this->tracking->getHtmlForTrackingReport(
             $data,
             $url_params,
             'schema_and_data',
-            $filter_ts_to,
-            $filter_ts_from,
             $filter_users,
             '10',
             '2022-11-03 22:15:24',
@@ -342,7 +336,7 @@ class TrackingTest extends AbstractTestCase
             'dmlog' => [
                 [
                     'statement' => 'statement',
-                    'date' => 'date',
+                    'date' => '2013-01-01 12:34:56',
                     'username' => 'username',
                 ],
             ],
@@ -351,19 +345,17 @@ class TrackingTest extends AbstractTestCase
         $url_params = [];
         $ddlog_count = 10;
         $drop_image_or_text = 'text';
-        $filter_ts_to = 9999999999;
-        $filter_ts_from = 0;
         $filter_users = ['*'];
 
         $html = $this->tracking->getHtmlForDataManipulationStatements(
             $data,
             $filter_users,
-            $filter_ts_from,
-            $filter_ts_to,
             $url_params,
             $ddlog_count,
             $drop_image_or_text,
-            '10'
+            '10',
+            '2010-01-01 12:34:56',
+            '2020-01-01 12:34:56'
         );
 
         $this->assertStringContainsString(
@@ -396,26 +388,24 @@ class TrackingTest extends AbstractTestCase
             'ddlog' => [
                 [
                     'statement' => 'statement',
-                    'date' => 'date',
+                    'date' => '2013-01-01 12:34:56',
                     'username' => 'username',
                 ],
             ],
             'dmlog' => ['dmlog'],
         ];
         $filter_users = ['*'];
-        $filter_ts_to = 9999999999;
-        $filter_ts_from = 0;
         $url_params = [];
         $drop_image_or_text = 'text';
 
         [$html, $count] = $this->tracking->getHtmlForDataDefinitionStatements(
             $data,
             $filter_users,
-            $filter_ts_from,
-            $filter_ts_to,
             $url_params,
             $drop_image_or_text,
-            '10'
+            '10',
+            '2010-01-01 12:34:56',
+            '2020-01-01 12:34:56'
         );
 
         $this->assertStringContainsString(
@@ -564,23 +554,27 @@ class TrackingTest extends AbstractTestCase
             'ddlog' => [
                 [
                     'statement' => 'statement1',
-                    'date' => 'date2',
+                    'date' => '2012-01-01 12:34:56',
                     'username' => 'username3',
                 ],
             ],
             'dmlog' => [
                 [
                     'statement' => 'statement1',
-                    'date' => 'date2',
+                    'date' => '2013-01-01 12:34:56',
                     'username' => 'username3',
                 ],
             ],
         ];
         $filter_users = ['*'];
-        $filter_ts_to = 9999999999;
-        $filter_ts_from = 0;
 
-        $entries = $this->tracking->getEntries($data, $filter_ts_from, $filter_ts_to, $filter_users, 'schema');
+        $entries = $this->tracking->getEntries(
+            $data,
+            $filter_users,
+            'schema',
+            '2010-01-01 12:34:56',
+            '2020-01-01 12:34:56'
+        );
         $this->assertEquals('username3', $entries[0]['username']);
         $this->assertEquals('statement1', $entries[0]['statement']);
     }