Re-engineer ArchiveInvalidationTest now that invalidation cascades up.

5 files changed, 22 insertions, 116 deletions

diff --git a/tests/PHPUnit/System/ArchiveInvalidationTest.php b/tests/PHPUnit/System/ArchiveInvalidationTest.php
index b64aa82479..7e41cd6eae 100644
--- a/tests/PHPUnit/System/ArchiveInvalidationTest.php
+++ b/tests/PHPUnit/System/ArchiveInvalidationTest.php
@@ -52,9 +52,9 @@ class ArchiveInvalidationTest extends SystemTestCase
         return array(
 
             array($apiToCall, array('idSite'                 => self::$fixture->idSite2,
-                                    'testSuffix'             => 'Website' . self::$fixture->idSite2 . "_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated",
+                                    'testSuffix'             => 'Website' . self::$fixture->idSite2 . "_NewDataShouldNotAppear_BecauseDayWasNotInvalidated",
                                     'date'                   => self::$fixture->dateTimeFirstDateWebsite2,
-                                    'periods'                => 'week',
+                                    'periods'                => 'day',
                                     'segment'                => 'pageUrl=@category/',
                                     'setDateLastN'           => 4, // 4months ahead
                                     'otherRequestParameters' => array('expanded' => 1))
@@ -99,8 +99,8 @@ class ArchiveInvalidationTest extends SystemTestCase
     public function testAnotherApi($api, $params)
     {
         if ($params['periods'] === 'month') {
-            // we do now need to invalidate weeks as well since months are based on weeks
-            $this->invalidateTestArchive(self::$fixture->idSite2, 'week', self::$fixture->dateTimeFirstDateWebsite2);
+            // we do now need to invalidate days as well since weeks are based on weeks
+            $this->invalidateTestArchive(self::$fixture->idSite2, 'week', self::$fixture->dateTimeFirstDateWebsite2, true);
         }
 
         $this->setBrowserArchivingTriggering(1);
@@ -135,16 +135,15 @@ class ArchiveInvalidationTest extends SystemTestCase
         $r = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&idSites=" . self::$fixture->idSite1 . "&dates=" . $dateToInvalidate1->format('Y-m-d'));
         $this->assertApiResponseHasNoError($r->process());
 
-        // Days & Months reports only are invalidated and we test our weekly report will still show old data.
-        $this->invalidateTestArchive(self::$fixture->idSite2, 'day', self::$fixture->dateTimeFirstDateWebsite2);
-        $this->invalidateTestArchive(self::$fixture->idSite2, 'month', self::$fixture->dateTimeFirstDateWebsite2);
+        // week reports only are invalidated and we test our daily report will still show old data.
+        $this->invalidateTestArchive(self::$fixture->idSite2, 'week', self::$fixture->dateTimeFirstDateWebsite2);
     }
 
-    private function invalidateTestArchive($idSite, $period, $dateTime)
+    private function invalidateTestArchive($idSite, $period, $dateTime, $cascadeDown = false)
     {
         $dates = new \DateTime($dateTime);
         $dates = $dates->format('Y-m-d');
-        $r = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&period=$period&idSites=$idSite&dates=$dates");
+        $r = new Request("module=API&method=CoreAdminHome.invalidateArchivedReports&period=$period&idSites=$idSite&dates=$dates&cascadeDown=" . (int)$cascadeDown);
         $this->assertApiResponseHasNoError($r->process());
     }
 }
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
deleted file mode 100644
index bcd758b7c5..0000000000
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result date="From 2010-01-04 to 2010-01-10">
-		<row>
-			<label>category</label>
-			<nb_visits>6</nb_visits>
-			<nb_hits>9</nb_hits>
-			<sum_time_spent>0</sum_time_spent>
-			<entry_nb_visits>2</entry_nb_visits>
-			<entry_nb_actions>18</entry_nb_actions>
-			<entry_sum_visit_length>2</entry_sum_visit_length>
-			<entry_bounce_count>0</entry_bounce_count>
-			<avg_time_on_page>0</avg_time_on_page>
-			<bounce_rate>0%</bounce_rate>
-			<exit_rate>0%</exit_rate>
-			<subtable>
-				<row>
-					<label>/Page1</label>
-					<nb_visits>2</nb_visits>
-					<nb_hits>3</nb_hits>
-					<sum_time_spent>0</sum_time_spent>
-					<entry_nb_visits>2</entry_nb_visits>
-					<entry_nb_actions>18</entry_nb_actions>
-					<entry_sum_visit_length>2</entry_sum_visit_length>
-					<entry_bounce_count>0</entry_bounce_count>
-					<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-					<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
-					<avg_time_on_page>0</avg_time_on_page>
-					<bounce_rate>0%</bounce_rate>
-					<exit_rate>0%</exit_rate>
-					<url>http://example.org/category/Page1</url>
-				</row>
-				<row>
-					<label>/Page2</label>
-					<nb_visits>2</nb_visits>
-					<nb_hits>3</nb_hits>
-					<sum_time_spent>0</sum_time_spent>
-					<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
-					<avg_time_on_page>0</avg_time_on_page>
-					<bounce_rate>0%</bounce_rate>
-					<exit_rate>0%</exit_rate>
-					<url>http://example.org/category/Page2</url>
-				</row>
-				<row>
-					<label>/NewPage</label>
-					<nb_visits>1</nb_visits>
-					<nb_hits>2</nb_hits>
-					<sum_time_spent>0</sum_time_spent>
-					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-					<avg_time_on_page>0</avg_time_on_page>
-					<bounce_rate>0%</bounce_rate>
-					<exit_rate>0%</exit_rate>
-					<url>http://example.org/category/NewPage</url>
-				</row>
-				<row>
-					<label>/Page3</label>
-					<nb_visits>1</nb_visits>
-					<nb_hits>1</nb_hits>
-					<sum_time_spent>0</sum_time_spent>
-					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-					<avg_time_on_page>0</avg_time_on_page>
-					<bounce_rate>0%</bounce_rate>
-					<exit_rate>0%</exit_rate>
-					<url>http://example.org/category/Page3</url>
-				</row>
-			</subtable>
-		</row>
-	</result>
-	<result date="From 2010-01-11 to 2010-01-17" />
-	<result date="From 2010-01-18 to 2010-01-24" />
-	<result date="From 2010-01-25 to 2010-01-31" />
-	<result date="From 2010-02-01 to 2010-02-07" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
deleted file mode 100644
index c494788d70..0000000000
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<results>
-	<result date="From 2010-01-04 to 2010-01-10">
-		<nb_uniq_visitors>2</nb_uniq_visitors>
-		<nb_users>1</nb_users>
-		<nb_visits>2</nb_visits>
-		<nb_actions>18</nb_actions>
-		<nb_visits_converted>0</nb_visits_converted>
-		<bounce_count>0</bounce_count>
-		<sum_visit_length>2</sum_visit_length>
-		<max_actions>12</max_actions>
-		<bounce_rate>0%</bounce_rate>
-		<nb_actions_per_visit>9</nb_actions_per_visit>
-		<avg_time_on_site>1</avg_time_on_site>
-	</result>
-	<result date="From 2010-01-11 to 2010-01-17" />
-	<result date="From 2010-01-18 to 2010-01-24" />
-	<result date="From 2010-01-25 to 2010-01-31" />
-	<result date="From 2010-02-01 to 2010-02-07" />
-</results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseDayWasNotInvalidated__Actions.getPageUrls_day.xml
index 3f580dfcf7..dea43adf43 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseDayWasNotInvalidated__Actions.getPageUrls_day.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="From 2010-01-04 to 2010-01-10">
+	<result date="2010-01-06">
 		<row>
 			<label>category</label>
 			<nb_visits>3</nb_visits>
@@ -17,14 +17,14 @@
 				<row>
 					<label>/Page1</label>
 					<nb_visits>1</nb_visits>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_hits>1</nb_hits>
 					<sum_time_spent>0</sum_time_spent>
+					<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
 					<entry_nb_visits>1</entry_nb_visits>
 					<entry_nb_actions>6</entry_nb_actions>
 					<entry_sum_visit_length>1</entry_sum_visit_length>
 					<entry_bounce_count>0</entry_bounce_count>
-					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-					<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
 					<avg_time_on_page>0</avg_time_on_page>
 					<bounce_rate>0%</bounce_rate>
 					<exit_rate>0%</exit_rate>
@@ -33,9 +33,9 @@
 				<row>
 					<label>/Page2</label>
 					<nb_visits>1</nb_visits>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_hits>1</nb_hits>
 					<sum_time_spent>0</sum_time_spent>
-					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 					<avg_time_on_page>0</avg_time_on_page>
 					<bounce_rate>0%</bounce_rate>
 					<exit_rate>0%</exit_rate>
@@ -44,9 +44,9 @@
 				<row>
 					<label>/Page3</label>
 					<nb_visits>1</nb_visits>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
 					<nb_hits>1</nb_hits>
 					<sum_time_spent>0</sum_time_spent>
-					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 					<avg_time_on_page>0</avg_time_on_page>
 					<bounce_rate>0%</bounce_rate>
 					<exit_rate>0%</exit_rate>
@@ -55,8 +55,8 @@
 			</subtable>
 		</row>
 	</result>
-	<result date="From 2010-01-11 to 2010-01-17" />
-	<result date="From 2010-01-18 to 2010-01-24" />
-	<result date="From 2010-01-25 to 2010-01-31" />
-	<result date="From 2010-02-01 to 2010-02-07" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+	<result date="2010-01-10" />
 </results>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseDayWasNotInvalidated__VisitsSummary.get_day.xml
index 75d267cfc4..241f0a7a02 100644
--- a/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseWeekWasNotInvalidated__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_Archive_InvalidationWebsite2_NewDataShouldNotAppear_BecauseDayWasNotInvalidated__VisitsSummary.get_day.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result date="From 2010-01-04 to 2010-01-10">
+	<result date="2010-01-06">
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_users>0</nb_users>
 		<nb_visits>1</nb_visits>
@@ -13,8 +13,8 @@
 		<nb_actions_per_visit>6</nb_actions_per_visit>
 		<avg_time_on_site>1</avg_time_on_site>
 	</result>
-	<result date="From 2010-01-11 to 2010-01-17" />
-	<result date="From 2010-01-18 to 2010-01-24" />
-	<result date="From 2010-01-25 to 2010-01-31" />
-	<result date="From 2010-02-01 to 2010-02-07" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+	<result date="2010-01-10" />
 </results>
\ No newline at end of file