Fixing tests

git-svn-id: http://dev.piwik.org/svn/trunk@7660 59fd770c-687e-43c8-a1e3-f5a4ff64c105

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" />

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" />

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" />

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" />

tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml

 <?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&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserCountry&amp;apiAction=getCountry&amp;period=range&amp;date=2012-12-13,now</imageGraphUrl>
-		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserCountry&amp;apiAction=getCountry&amp;period=day&amp;date=2012-12-13,now</imageGraphEvolutionUrl>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserCountry&amp;apiAction=getCountry&amp;period=range&amp;date=</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=UserCountry&amp;apiAction=getCountry&amp;period=day&amp;date=</imageGraphEvolutionUrl>
 		<uniqueId>UserCountry_getCountry</uniqueId>
 	</metadata>
 	<columns>

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';