diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index a74b31b5ee4f3f21771c7724b2ff38b002075fd7..27affa6ef44fbc7c9f62faf68d99e8dca0e60250 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/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) { diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index 72398027cbe891bf85bc0fb4a95bffc3fa6b3981..34b31b8800eeebce734f6b1aa06f5e6fa736e7f1 100755 --- a/tests/integration/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/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. <br /> The table is organized hierarchically, the URLs are displayed as a folder structure.<br />Use the plus and minus icons on the left to navigate.</documentation> <actionToLoadSubTables>getPageUrls</actionToLoadSubTables> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=week&date=2010-03-06&idSubtable=1650</imageGraphUrl> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Actions&apiAction=getPageUrls&period=week&date=2010-03-06&idSubtable=</imageGraphUrl> <uniqueId>Actions_getPageUrls</uniqueId> </metadata>