Refs #2742, fix test issue.

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

tests/PHPUnit/IntegrationTestCase.php

@@ -722,6 +722,14 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
             $expected = $this->removeXmlElement($expected, 'imageGraphUrl');
             $response = $this->removeXmlElement($response, 'imageGraphUrl');
         }
+        
+        // if idSubtable is in request URL, make sure idSubtable values are not in any urls
+        if (strpos($requestUrl, 'idSubtable=') !== false)
+        {
+        	$regex = "/idSubtable=[0-9]+/";
+        	$expected = preg_replace($regex, 'idSubtable=', $expected);
+        	$response = preg_replace($regex, 'idSubtable=', $response);
+        }
 
         // is there a better way to test for the current DB type in use?
         if (Zend_Registry::get('db') instanceof Piwik_Db_Adapter_Mysqli) {

tests/integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml

@@ -26,7 +26,7 @@
 		</metricsDocumentation>
 		<documentation>This report contains information about the page URLs that have been visited. &lt;br /&gt; The table is organized hierarchically, the URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
 		<actionToLoadSubTables>getPageUrls</actionToLoadSubTables>
-		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Actions&amp;apiAction=getPageUrls&amp;period=week&amp;date=2010-03-06&amp;idSubtable=1650</imageGraphUrl>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=Actions&amp;apiAction=getPageUrls&amp;period=week&amp;date=2010-03-06&amp;idSubtable=</imageGraphUrl>
 		<uniqueId>Actions_getPageUrls</uniqueId>
 
 	</metadata>