Enable commented out tests in BackwardsCompatibility1XTest by executing update after sql dump is loaded.

5 files changed, 59 insertions, 18 deletions

diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
index 26745251c4..63515e8d09 100644
--- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
+++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php
@@ -7,8 +7,11 @@
  */
 
 use Piwik\Date;
+use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
+use Piwik\Updater;
+use Piwik\Plugins\CoreUpdater\CoreUpdater;
 use \Fixture;
 
 /**
@@ -24,21 +27,37 @@ class Test_Piwik_Integration_BackwardsCompatibility1XTest extends IntegrationTes
     {
         parent::setUpBeforeClass();
 
-        // FIXME:
-        // we should run tests to see if old data + new data can be mixed successfully if a period spans both
-        // old + new data, but we can't track visits w/ piwik 1.12 data. need to run the updater first.
+        self::updateDatabase();
+        Fixture::loadAllPlugins();
 
         // add two visits from same visitor on dec. 29
-        //$t = Fixture::getTracker(1, '2012-12-29 01:01:30', $defaultInit = true);
-        //$t->setUrl('http://site.com/index.htm');
-        //Fixture::checkResponse($t->doTrackPageView('incredible title!'));
+        $t = Fixture::getTracker(1, '2012-12-29 01:01:30', $defaultInit = true);
+        $t->setUrl('http://site.com/index.htm');
+        Fixture::checkResponse($t->doTrackPageView('incredible title!'));
 
-        //$t->setForceVisitDateTime('2012-12-29 03:01:30');
-        //$t->setUrl('http://site.com/other/index.htm');
-        //Fixture::checkResponse($t->doTrackPageView('other incredible title!'));
+        $t->setForceVisitDateTime('2012-12-29 03:01:30');
+        $t->setUrl('http://site.com/other/index.htm');
+        Fixture::checkResponse($t->doTrackPageView('other incredible title!'));
 
         // launch archiving
-        //VisitFrequencyApi::getInstance()->get(1, 'month', '2012-12-29');
+        VisitFrequencyApi::getInstance()->get(1, 'year', '2012-12-29');
+    }
+
+    private static function updateDatabase()
+    {
+        $updater = new Updater();
+        $componentsWithUpdateFile = CoreUpdater::getComponentUpdates($updater);
+        if (empty($componentsWithUpdateFile)) {
+            throw new \Exception("Failed to update pre-2.0 database (nothing to update).");
+        }
+
+        $result = CoreUpdater::updateComponents($updater, $componentsWithUpdateFile);
+        if (!empty($result['coreError'])
+            && !empty($result['warnings'])
+            && !empty($result['errors'])
+        ) {
+            throw new \Exception("Failed to update pre-2.0 database (errors or warnings found): " . print_r($result, true));
+        }
     }
 
     public function setUp()
@@ -73,14 +92,11 @@ class Test_Piwik_Integration_BackwardsCompatibility1XTest extends IntegrationTes
             array('VisitFrequency.get', array('idSite' => $idSite, 'date' => '2012-03-03', 'setDateLastN' => true,
                                               'disableArchiving' => true)),
 
-            /* cannot test this (see above)
             array('VisitFrequency.get', array('idSite' => $idSite, 'date' => $dateTime, 'periods' => array('year'),
-                                              'compareAgainst' => 'OneVisitorTwoVisits',
                                               'disableArchiving' => true)),
 
             array('VisitFrequency.get', array('idSite' => $idSite, 'date' => '2012-03-06,2012-12-31',
                                               'periods' => array('range'), 'disableArchiving' => true))
-            */
         );
     }
 }
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
index 0563eb5a40..196edba881 100644
--- a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_day.xml
@@ -7,10 +7,10 @@
 		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
 		<nb_visits_returning>1</nb_visits_returning>
 		<nb_actions_returning>1</nb_actions_returning>
-		<max_actions_returning>1</max_actions_returning>
-		<sum_visit_length_returning>0</sum_visit_length_returning>
-		<bounce_count_returning>1</bounce_count_returning>
 		<nb_visits_converted_returning>1</nb_visits_converted_returning>
+		<bounce_count_returning>1</bounce_count_returning>
+		<sum_visit_length_returning>0</sum_visit_length_returning>
+		<max_actions_returning>1</max_actions_returning>
 		<bounce_rate_returning>100%</bounce_rate_returning>
 		<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
 		<avg_time_on_site_returning>0</avg_time_on_site_returning>
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
new file mode 100644
index 0000000000..05d0ce3953
--- /dev/null
+++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_visits_returning>1</nb_visits_returning>
+	<nb_actions_returning>1</nb_actions_returning>
+	<nb_visits_converted_returning>1</nb_visits_converted_returning>
+	<bounce_count_returning>1</bounce_count_returning>
+	<sum_visit_length_returning>0</sum_visit_length_returning>
+	<max_actions_returning>1</max_actions_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
+	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
new file mode 100644
index 0000000000..05d0ce3953
--- /dev/null
+++ b/tests/PHPUnit/Integration/expected/test_BackwardsCompatibility1XTest__VisitFrequency.get_year.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<nb_visits_returning>1</nb_visits_returning>
+	<nb_actions_returning>1</nb_actions_returning>
+	<nb_visits_converted_returning>1</nb_visits_converted_returning>
+	<bounce_count_returning>1</bounce_count_returning>
+	<sum_visit_length_returning>0</sum_visit_length_returning>
+	<max_actions_returning>1</max_actions_returning>
+	<bounce_rate_returning>100%</bounce_rate_returning>
+	<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
+	<avg_time_on_site_returning>0</avg_time_on_site_returning>
+</result>
\ No newline at end of file
diff --git a/tests/resources/piwik-1.13-dump.sql b/tests/resources/piwik-1.13-dump.sql
index c36d5e1153..e39488b63a 100644
--- a/tests/resources/piwik-1.13-dump.sql
+++ b/tests/resources/piwik-1.13-dump.sql
@@ -469,6 +469,7 @@ CREATE TABLE `piwiktests_log_visit` (
   `custom_var_v4` varchar(200) DEFAULT NULL,
   `custom_var_k5` varchar(200) DEFAULT NULL,
   `custom_var_v5` varchar(200) DEFAULT NULL,
+  `location_provider` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`idvisit`),
   KEY `index_idsite_config_datetime` (`idsite`,`config_id`,`visit_last_action_time`),
   KEY `index_idsite_datetime` (`idsite`,`visit_last_action_time`),
@@ -482,7 +483,7 @@ CREATE TABLE `piwiktests_log_visit` (
 
 LOCK TABLES `piwiktests_log_visit` WRITE;
 /*!40000 ALTER TABLE `piwiktests_log_visit` DISABLE KEYS */;
-INSERT INTO `piwiktests_log_visit` VALUES (1,1,'¬¬nÂ5','12:34:06',0,1,0,0,0,'2012-03-06 11:22:33','2012-03-06 11:49:33',9,8,2,1,7,0,1621,1,0,3,'referer.com','http://referer.com/page.htm?param=valuewith some spaces','','|hQâ²C^','WXP','XP','FF','3.6',0,NULL,NULL,'1024x768',0,1,1,0,0,0,0,0,0,1,'œ','fr','fr',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,1,'¬¬nÂ5','12:34:06',1,2,0,0,0,'2012-03-06 12:22:33','2012-03-06 12:22:33',11,10,11,10,1,0,0,1,0,2,'Yahoo!','http://search.yahoo.com/search?p=purchase','purchase','|hQâ²C^','WXP','XP','FF','3.6',0,NULL,NULL,'1024x768',0,1,1,0,0,0,0,0,0,1,'œ','fr','fr',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `piwiktests_log_visit` VALUES (1,1,'¬¬nÂ5','12:34:06',0,1,0,0,0,'2012-03-06 11:22:33','2012-03-06 11:49:33',9,8,2,1,7,0,1621,1,0,3,'referer.com','http://referer.com/page.htm?param=valuewith some spaces','','|hQâ²C^','WXP','XP','FF','3.6',0,NULL,NULL,'1024x768',0,1,1,0,0,0,0,0,0,1,'œ','fr','fr',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,1,'¬¬nÂ5','12:34:06',1,2,0,0,0,'2012-03-06 12:22:33','2012-03-06 12:22:33',11,10,11,10,1,0,0,1,0,2,'Yahoo!','http://search.yahoo.com/search?p=purchase','purchase','|hQâ²C^','WXP','XP','FF','3.6',0,NULL,NULL,'1024x768',0,1,1,0,0,0,0,0,0,1,'œ','fr','fr',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `piwiktests_log_visit` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -618,7 +619,7 @@ CREATE TABLE `piwiktests_option` (
 
 LOCK TABLES `piwiktests_option` WRITE;
 /*!40000 ALTER TABLE `piwiktests_option` DISABLE KEYS */;
-INSERT INTO `piwiktests_option` VALUES ('lastPurge_piwiktests_archive_blob_2012_03','1381269344',0),('lastPurge_piwiktests_archive_blob_2012_04','1381269345',0),('MobileMessaging_DelegatedManagement','false',0),('SitesManager_EnableSiteSpecificUserAgentExclude','',0);
+INSERT INTO `piwiktests_option` VALUES ('lastPurge_piwiktests_archive_blob_2012_03','1381269344',0),('lastPurge_piwiktests_archive_blob_2012_04','1381269345',0),('MobileMessaging_DelegatedManagement','false',0),('SitesManager_EnableSiteSpecificUserAgentExclude','',0),('version_Actions', '1.12',1),('version_Annotations', '1.12',1),('version_API', '1.12',1),('version_core', '1.12',1),('version_CoreAdminHome', '1.12',1),('version_CoreHome', '1.12',1),('version_CorePluginsAdmin', '1.12',1),('version_CoreUpdater', '1.12',1),('version_CustomVariables', '1.12',1),('version_Dashboard', '1.12',1),('version_DoNotTrack', '1.12',1),('version_ExampleAPI', '0.1',1),('version_ExamplePlugin', '0.1',1),('version_ExampleRssWidget', '0.1',1),('version_Feedback', '1.12',1),('version_Goals', '1.12',1),('version_ImageGraph', '1.12',1),('version_Installation', '1.12',1),('version_LanguagesManager', '1.12',1),('version_Live', '1.12',1),('version_Login', '1.12',1),('version_MobileMessaging', '1.12',1),('version_MultiSites', '1.12',1),('version_Overlay', '1.12',1),('version_PDFReports', '1.12',1),('version_PrivacyManager', '1.12',1),('version_Provider', '1.12',1),('version_Proxy', '1.12',1),('version_Referers', '1.12',1),('version_SegmentEditor', '1.12',1),('version_SEO', '1.12',1),('version_SitesManager', '1.12',1),('version_Transitions', '1.12',1),('version_UserCountry', '1.12',1),('version_UserCountryMap', '1.12',1),('version_UserSettings', '1.12',1),('version_UsersManager', '1.12',1),('version_VisitFrequency', '1.12',1),('version_VisitorGenerator', '1.12',1),('version_VisitorInterest', '1.12',1),('version_VisitsSummary', '1.12',1),('version_VisitTime', '1.12',1),('version_Widgetize', '1.12',1);
 /*!40000 ALTER TABLE `piwiktests_option` ENABLE KEYS */;
 UNLOCK TABLES;