From 1266fa866427b0597dc39a8a9d2c87d6e9001b26 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Wed, 19 Dec 2012 13:16:16 +0000
Subject: [PATCH] Fixing tests
git-svn-id: http://dev.piwik.org/svn/trunk@7660 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
...iables_firstSite_lastN__API.getProcessedReport_day.xml | 8 ++++----
...bles_firstSite_lastN__API.getProcessedReport_month.xml | 4 ++--
...Titles_firstSite_lastN__API.getProcessedReport_day.xml | 4 ++--
...bsites_firstSite_lastN__API.getProcessedReport_day.xml | 4 ++--
...MetadataAndNormalAPI__API.getProcessedReport_range.xml | 6 +++---
tests/PHPUnit/IntegrationTestCase.php | 1 +
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
index 273af3899b..ea8dd45a78 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml
@@ -107,18 +107,18 @@
<reportMetadata>
<result prettyDate="Sunday 3 January 2010">
<row>
- <idsubdatatable>8</idsubdatatable>
+
</row>
<row>
- <idsubdatatable>7</idsubdatatable>
+
</row>
</result>
<result prettyDate="Monday 4 January 2010">
<row>
- <idsubdatatable>40</idsubdatatable>
+
</row>
<row>
- <idsubdatatable>39</idsubdatatable>
+
</row>
</result>
<result prettyDate="Tuesday 5 January 2010" />
diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
index f012eba71f..6fd7f79af1 100644
--- a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml
@@ -82,10 +82,10 @@
<reportMetadata>
<result prettyDate="2010, January">
<row>
- <idsubdatatable>314</idsubdatatable>
+
</row>
<row>
- <idsubdatatable>313</idsubdatatable>
+
</row>
</result>
<result prettyDate="2010, February" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index da52d9af39..12bc1cb025 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -85,10 +85,10 @@
<result prettyDate="Monday 4 January 2010" />
<result prettyDate="Tuesday 5 January 2010">
<row>
- <idsubdatatable>70</idsubdatatable>
+
</row>
<row>
- <idsubdatatable>69</idsubdatatable>
+
</row>
</result>
<result prettyDate="Wednesday 6 January 2010" />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index 800b4c3ca8..dae8f3c352 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -88,12 +88,12 @@
<result prettyDate="Sunday 3 January 2010" />
<result prettyDate="Monday 4 January 2010">
<row>
- <idsubdatatable>46</idsubdatatable>
+
</row>
</result>
<result prettyDate="Tuesday 5 January 2010">
<row>
- <idsubdatatable>81</idsubdatatable>
+
</row>
</result>
<result prettyDate="Wednesday 6 January 2010" />
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
index 10acced199..08c3375dfb 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>13 Dec 12 - 19 Dec 12</prettyDate>
+
<metadata>
<category>Visitors</category>
<name>Country</name>
@@ -36,8 +36,8 @@
<processedMetricsGoal>
<revenue_per_visit>Revenue per Visit</revenue_per_visit>
</processedMetricsGoal>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserCountry&apiAction=getCountry&period=range&date=2012-12-13,now</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserCountry&apiAction=getCountry&period=day&date=2012-12-13,now</imageGraphEvolutionUrl>
+ <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserCountry&apiAction=getCountry&period=range&date=</imageGraphUrl>
+ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserCountry&apiAction=getCountry&period=day&date=</imageGraphEvolutionUrl>
<uniqueId>UserCountry_getCountry</uniqueId>
</metadata>
<columns>
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 827e0ed778..519d6df307 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -178,6 +178,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
'API',
'ImageGraph',
'Annotations',
+ 'UserCountry.getLocationFromIP',
);
const DEFAULT_USER_PASSWORD = 'nopass';
--
GitLab