adjust some tests to work with MariaDb

matomo-org · May 7, 2024 · 42eb5f1 · 42eb5f1
1 parent fca078a
commit 42eb5f1
Show file tree

Hide file tree

Showing 9 changed files with 995 additions and 980 deletions.
diff --git a/...ns/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/...ns/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
diff --git a/...System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml b/...System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_visits>35</nb_visits>
-	<nb_actions>95</nb_actions>
-	<nb_visits_converted>35</nb_visits_converted>
-	<bounce_count>18</bounce_count>
-	<sum_visit_length>27579</sum_visit_length>
-	<max_actions>5</max_actions>
-	<bounce_rate>51%</bounce_rate>
-	<nb_actions_per_visit>2.7</nb_actions_per_visit>
-	<avg_time_on_site>788</avg_time_on_site>
+	<nb_visits>1</nb_visits>
+	<nb_actions>1</nb_actions>
+	<nb_visits_converted>1</nb_visits_converted>
+	<bounce_count>1</bounce_count>
+	<sum_visit_length>0</sum_visit_length>
+	<max_actions>1</max_actions>
+	<bounce_rate>100%</bounce_rate>
+	<nb_actions_per_visit>1</nb_actions_per_visit>
+	<avg_time_on_site>0</avg_time_on_site>
 </result>
diff --git a/plugins/UsersManager/tests/Integration/ModelTest.php b/plugins/UsersManager/tests/Integration/ModelTest.php
@@ -77,11 +77,16 @@ public function testGetSitesAccessFromUserMultipleSites()
         $this->model->addUserAccess($this->login, Write::ID, array(3));
         $this->model->addUserAccess($this->login, Write::ID, array(2));
         $this->model->addUserAccess($this->login, View::ID, array(1));
+        $access = $this->model->getSitesAccessFromUser($this->login);
+        // The order might differ depending on the database, so sort by 'idaction'
+        usort($access, function ($a, $b) {
+            return $a['site'] - $b['site'];
+        });
         $this->assertEquals(array(
-          array('site' => '3', 'access' => Write::ID),
-          array('site' => '2', 'access' => Write::ID),
-          array('site' => '1', 'access' => View::ID),
-        ), $this->model->getSitesAccessFromUser($this->login));
+            array('site' => '1', 'access' => View::ID),
+            array('site' => '2', 'access' => Write::ID),
+            array('site' => '3', 'access' => Write::ID),
+        ), $access);
     }
 
     public function testGetSitesAccessFromUserMultipleSitesSomeNoLongerExist()

diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -158,7 +158,7 @@ protected function trackVisit(\MatomoTracker $t, $fixtureCounter, $visitorCounte
         }
 
         // first visit
-        $date = Date::factory($this->dateTime)->addDay($visitorCounter);
+        $date = Date::factory($this->dateTime)->addDay($visitorCounter)->addPeriod($fixtureCounter, 'SECOND');
         $t->setForceVisitDateTime($date->getDatetime());
         $t->setUrl("http://piwik.net/grue/lair");
         $t->setCustomVariable(1, 'Cvar 1 name', 'Cvar1 value is ' . $visitorCounter, 'visit');

diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -170,6 +170,11 @@ public static function isMysqli()
         return getenv('MYSQL_ADAPTER') == 'MYSQLI';
     }
 
+    public static function isMariaDb()
+    {
+        return getenv('MYSQL_SCHEMA') === 'Mariadb' || Config::getInstance()->database['schema'] === 'Mariadb';
+    }
+
     /**
      * Return 4 Api Urls for testing scheduled reports :
      * - one in HTML format with all available reports

diff --git a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
@@ -325,7 +325,7 @@ public function testGenerateQueryWithSegmentVisitLogJoinRightJoinOnOtherTableSho
 
     public function testSetMaxExecutionTimeOfArchivingQueries()
     {
-        if (SystemTestCase::isMysqli()) {
+        if (!SystemTestCase::isMariaDb() && SystemTestCase::isMysqli()) {
             // See https://github.com/matomo-org/matomo/issues/17871
             $this->markTestSkipped('Max execution query hint does not work for Mysqli.');
         }

diff --git a/tests/PHPUnit/Integration/Tracker/ModelTest.php b/tests/PHPUnit/Integration/Tracker/ModelTest.php
@@ -91,6 +91,11 @@ public function testGetIdsActionCorrectlyReturnsRequestedActionIds()
             array('name' => 'action2', 'type' => 2)
         ));
 
+        // The order might differ depending on the database, so sort by 'idaction'
+        usort($result, function ($a, $b) {
+            return $a['idaction'] - $b['idaction'];
+        });
+
         $expectedResult = array(
             array(
                 'idaction' => '2',