diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-07-28 19:12:52 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2015-10-06 17:23:54 +0300 |
| commit | d8cd9454d4f213acfb8df0d155fc4da9ae0a7a81 (patch) | |
| tree | bd96523f4bae4cf38210f276ff84a91e23c57cf0 /tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php | |
| parent | e30de3346a74ea908ee1e9944dbc5686016e11a4 (diff) | |
starting to prepare the requirement of php 5.4
Diffstat (limited to 'tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php')
| -rwxr-xr-x | tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php | 90 |
1 files changed, 42 insertions, 48 deletions
diff --git a/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php index 35daba0b5d..d1301d728a 100755 --- a/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php +++ b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php @@ -115,54 +115,48 @@ class ManyVisitorsOneWebsiteTest extends SystemTestCase )), ); - // Randomly fails on 5.3 - if(!self::isPhpVersion53()) { - - $apiToTest[] = array('Live.getLastVisitsDetails', array( - 'idSite' => $idSite, - 'date' => $dateString, - 'periods' => 'month', - 'testSuffix' => '_Live.getLastVisitsDetails_sortDesc', - 'otherRequestParameters' => array('filter_sort_order' => 'desc', 'filter_limit' => 7) - )); - - // #5950 - $apiToTest[] = array('Live.getLastVisitsDetails', array( - 'idSite' => $idSite, - 'date' => $dateString, - 'periods' => 'month', - 'testSuffix' => '_Live.getLastVisitsDetails_sortByIdVisit', - 'otherRequestParameters' => array('filter_sort_order' => 'desc', 'filter_sort_column' => 'idVisit', 'filter_limit' => 7) - )); - - // #7458 - $apiToTest[] = array('Live.getLastVisitsDetails', array( - 'idSite' => $idSite, - 'date' => $dateString, - 'periods' => 'month', - 'testSuffix' => '_Live.getLastVisitsDetails_offsetAndLimit_1', - 'otherRequestParameters' => array('filter_offset' => '1', 'filter_limit' => 3) - )); - $apiToTest[] = array('Live.getLastVisitsDetails', array( - 'idSite' => $idSite, - 'date' => $dateString, - 'periods' => 'month', - 'testSuffix' => '_Live.getLastVisitsDetails_offsetAndLimit_2', - 'otherRequestParameters' => array('filter_offset' => '4', 'filter_limit' => 3) - )); - - // #8324 - // testing filter_excludelowpop and filter_excludelowpop_value - $apiToTest[] = array('UserCountry.getCountry', array( - 'idSite' => $idSite, - 'date' => $dateString, - 'periods' => 'month', - 'testSuffix' => '_getCountry_with_filter_excludelowpop', - 'otherRequestParameters' => array('filter_excludelowpop' => 'nb_visits', 'filter_excludelowpop_value' => 5) - )); - - - } + $apiToTest[] = array('Live.getLastVisitsDetails', array( + 'idSite' => $idSite, + 'date' => $dateString, + 'periods' => 'month', + 'testSuffix' => '_Live.getLastVisitsDetails_sortDesc', + 'otherRequestParameters' => array('filter_sort_order' => 'desc', 'filter_limit' => 7) + )); + + // #5950 + $apiToTest[] = array('Live.getLastVisitsDetails', array( + 'idSite' => $idSite, + 'date' => $dateString, + 'periods' => 'month', + 'testSuffix' => '_Live.getLastVisitsDetails_sortByIdVisit', + 'otherRequestParameters' => array('filter_sort_order' => 'desc', 'filter_sort_column' => 'idVisit', 'filter_limit' => 7) + )); + + // #7458 + $apiToTest[] = array('Live.getLastVisitsDetails', array( + 'idSite' => $idSite, + 'date' => $dateString, + 'periods' => 'month', + 'testSuffix' => '_Live.getLastVisitsDetails_offsetAndLimit_1', + 'otherRequestParameters' => array('filter_offset' => '1', 'filter_limit' => 3) + )); + $apiToTest[] = array('Live.getLastVisitsDetails', array( + 'idSite' => $idSite, + 'date' => $dateString, + 'periods' => 'month', + 'testSuffix' => '_Live.getLastVisitsDetails_offsetAndLimit_2', + 'otherRequestParameters' => array('filter_offset' => '4', 'filter_limit' => 3) + )); + + // #8324 + // testing filter_excludelowpop and filter_excludelowpop_value + $apiToTest[] = array('UserCountry.getCountry', array( + 'idSite' => $idSite, + 'date' => $dateString, + 'periods' => 'month', + 'testSuffix' => '_getCountry_with_filter_excludelowpop', + 'otherRequestParameters' => array('filter_excludelowpop' => 'nb_visits', 'filter_excludelowpop_value' => 5) + )); // this also fails on all PHP versions, it seems randomly. // $apiToTest[] = array('Live.getLastVisitsDetails', array( |