skip test for older versions as numbers have changed

Author: sgiehl

tests/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php

@@ -17,6 +17,7 @@
 use Piwik\Db;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Plugins\CustomVariables\tests\Fixtures\TwoVisitsWithCustomVariables;
+use Piwik\Version;
 
 /**
  * Tests use of custom variable segments.
@@ -77,6 +78,10 @@ public function getApiForTesting()
      */
     public function testCheck()
     {
+        if (version_compare(Version::VERSION, '5.4.0-b3', '<')) {
+            self::markTestSkipped('archive numbers have changed');
+        }
+
         // TODO: if we do this in archivewriter, we don't need this code
         $archivePurger = StaticContainer::get(ArchivePurger::class);
         $archivePurger->purgeInvalidatedArchivesFrom(Date::factory(self::$fixture->dateTime));
@@ -128,6 +133,10 @@ public function testCheck()
      */
     public function test_checkArchiveRecords_shouldMergeSubtablesIntoOneRow()
     {
+        if (version_compare(Version::VERSION, '5.4.0-b3', '<')) {
+            self::markTestSkipped('archive numbers have changed');
+        }
+
         $chunk = new Chunk();
 
         $tests = array(

tests/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_day.xml

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<result date="2010-01-03" />
+		<result date="2010-01-03">
+			<nb_uniq_visitors>0</nb_uniq_visitors>
+			<nb_users>0</nb_users>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_visits_converted>0</nb_visits_converted>
+			<bounce_count>0</bounce_count>
+			<sum_visit_length>0</sum_visit_length>
+			<max_actions>0</max_actions>
+			<bounce_rate>0%</bounce_rate>
+			<nb_actions_per_visit>0</nb_actions_per_visit>
+			<avg_time_on_site>0</avg_time_on_site>
+		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
 		<result date="2010-01-06" />

tests/System/expected/test_twoVisitsWithCustomVariables_segmentMatchNONE__VisitsSummary.get_week.xml

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
 	<result idSite="1">
-		<result date="2009-12-28,2010-01-03" />
+		<result date="2009-12-28,2010-01-03">
+			<nb_uniq_visitors>0</nb_uniq_visitors>
+			<nb_users>0</nb_users>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_visits_converted>0</nb_visits_converted>
+			<bounce_count>0</bounce_count>
+			<sum_visit_length>0</sum_visit_length>
+			<max_actions>0</max_actions>
+			<bounce_rate>0%</bounce_rate>
+			<nb_actions_per_visit>0</nb_actions_per_visit>
+			<avg_time_on_site>0</avg_time_on_site>
+		</result>
 		<result date="2010-01-04,2010-01-10" />
 		<result date="2010-01-11,2010-01-17" />
 		<result date="2010-01-18,2010-01-24" />