From b6dfdc06e084f46668c679f0110e5a67146cef43 Mon Sep 17 00:00:00 2001 From: mattab Date: Thu, 13 Mar 2014 14:51:02 +1300 Subject: [PATCH] Refs #3632 test case that _idvc > 1 will set visitor returning status --- ...ogs__Goals.getVisitsUntilConversion_month.xml | 4 ++-- ...portLogs__Live.getLastVisitsDetails_month.xml | 6 +++--- ...test_ImportLogs__VisitFrequency.get_month.xml | 16 ++++++++-------- ...st.getNumberOfVisitsByDaysSinceLast_month.xml | 4 ++-- ...erest.getNumberOfVisitsByVisitCount_month.xml | 8 ++++---- tests/resources/access-logs/fake_logs_replay.log | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml index be7c627e431..61700b72e69 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml @@ -2,11 +2,11 @@ - 33 + 32 - 1 + 2 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml index 89a4659bca2..daaf9889db7 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml @@ -859,8 +859,8 @@ 33 80.136.160.65 - new - + returning + plugins/Live/images/returningVisitor.gif 1 plugins/Zeitgeist/images/goal.png none @@ -908,7 +908,7 @@ 0 0s - 1 + 2 0 0 0 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml index 081b509fca8..d74050dd49d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml @@ -1,13 +1,13 @@ - 4 - 4 - 5 - 4 - 3 + 5 + 5 + 6 + 5 + 4 81 2 - 75% - 1.3 - 20 + 80% + 1.2 + 16 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index 1e3ed6ff680..9ea269a0ca2 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,11 +2,11 @@ - 34 + 33 - 3 + 4 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml index 4eb00c41c9c..2220417182b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,13 +2,13 @@ - 35 - 92% + 34 + 89% - 1 - 3% + 2 + 5% diff --git a/tests/resources/access-logs/fake_logs_replay.log b/tests/resources/access-logs/fake_logs_replay.log index dcaa87ad271..791aba16011 100644 --- a/tests/resources/access-logs/fake_logs_replay.log +++ b/tests/resources/access-logs/fake_logs_replay.log @@ -14,7 +14,7 @@ 93.80.130.163 - - [18/Aug/2012:01:32:32 +0100] "GET /piwik.php?download=http%3A%2F%2Fbuilds.piwik.org%2Flatest.zip&idsite=1&rec=1&r=533958&h=4&m=28&s=25&url=http%3A%2F%2Fpiwik.org%2Fdownload%2F&urlref=http%3A%2F%2Fpiwik.org%2F&_id=f077de87fa56021e&_idts=1394670499&_idvc=1&_idn=0&_refts=1394670499&_viewts=1394670499&_ref=http%3A%2F%2Fwww.google.ru%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCoQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3DffwgU57VGuf44QT3-oCQCw%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.bGE%26cad%3Drjt&pdf=0&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=113 HTTP/1.1" 200 43 "http://piwik.org/download/" "Mozilla/5.0 (Windows NT 6.2; rv:27.0) Gecko/20100101 Firefox/27.0" 188.107.238.9 - - [18/Aug/2012:01:33:11 +0100] "GET /piwik.php?action_name=Log%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=993149&h=1&m=33&s=13&url=http%3A%2F%2Fpiwik.org%2Flog-analytics%2F&urlref=http%3A%2F%2Fforum.golem.de%2Fkommentare%2Fsecurity%2Furteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen%2Fpiwik-log-analytics%2F80715%2C3669355%2C3669355%2Cread.html&_id=d6f0dcb66949b86b&_idts=1394670793&_idvc=1&_idn=1&_refts=1394670793&_viewts=1394670793&_ref=http%3A%2F%2Fforum.golem.de%2Fkommentare%2Fsecurity%2Furteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen%2Fpiwik-log-analytics%2F80715%2C3669355%2C3669355%2Cread.html&pdf=1&qt=1&realp=0&wma=1&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=2560x1440&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=145 HTTP/1.1" 200 43 "http://piwik.org/log-analytics/" "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0" 206.190.75.8 - - [18/Aug/2012:01:33:27 +0100] "GET /piwik.php?action_name=Changelog%20Archive%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=697117&h=17&m=33&s=27&url=http%3A%2F%2Fpiwik.org%2Fchangelog%2F&urlref=http%3A%2F%2Fpiwik.org%2Fwhat-is-piwik%2F&_id=e0eb35c4fae2aa0a&_idts=1379033580&_idvc=2&_idn=0&_refts=1394669945&_viewts=1379033693&_ref=http%3A%2F%2Ftrends.builtwith.com%2Fanalytics%2FPiwik-Web-Analytics&res=1536x864&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/changelog/" "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; .NET4.0C; InfoPath.2)" -80.136.160.65 - - [18/Aug/2012:01:33:33 +0100] "GET /piwik.php?action_name=Piwik%202.1%20%E2%80%94%20Massive%20Performance%20and%20Reliability%20Improvements%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=542198&h=1&m=33&s=31&url=http%3A%2F%2Fpiwik.org%2Fblog%2F2014%2F03%2Fpiwik-2-1-massive-performance-reliability-improvements%2F&urlref=http%3A%2F%2Fberndjung.com%2Fpiwik%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26idSite%3D1%26period%3Dday%26date%3Dtoday&_id=fc96e596bd4c5d54&_idts=1394670812&_idvc=1&_idn=1&_refts=1394670812&_viewts=1394670812&_ref=http%3A%2F%2Fberndjung.com%2Fpiwik%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26idSite%3D1%26period%3Dday%26date%3Dtoday&pdf=0&qt=0&realp=0&wma=0&dir=0&fla=1&java=0&gears=0&ag=0&cookie=1&res=360x640&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=119 HTTP/1.1" 200 43 "http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/" "Mozilla/5.0 (Android; Mobile; rv:27.0) Gecko/27.0 Firefox/27.0" +80.136.160.65 - - [18/Aug/2012:01:33:33 +0100] "GET /piwik.php?action_name=Piwik%202.1%20%E2%80%94%20Massive%20Performance%20and%20Reliability%20Improvements%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=542198&h=1&m=33&s=31&url=http%3A%2F%2Fpiwik.org%2Fblog%2F2014%2F03%2Fpiwik-2-1-massive-performance-reliability-improvements%2F&urlref=http%3A%2F%2Fberndjung.com%2Fpiwik%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26idSite%3D1%26period%3Dday%26date%3Dtoday&_id=fc96e596bd4c5d54&_idts=1394670812&_idvc=2&_idn=1&_refts=1394670812&_viewts=1394670812&_ref=http%3A%2F%2Fberndjung.com%2Fpiwik%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26idSite%3D1%26period%3Dday%26date%3Dtoday&pdf=0&qt=0&realp=0&wma=0&dir=0&fla=1&java=0&gears=0&ag=0&cookie=1&res=360x640&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=119 HTTP/1.1" 200 43 "http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/" "Mozilla/5.0 (Android; Mobile; rv:27.0) Gecko/27.0 Firefox/27.0" 219.101.46.222 - - [18/Aug/2012:01:33:50 +0100] "GET /piwik.php?action_name=Log%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=263291&h=9&m=33&s=50&url=https%3A%2F%2Fpiwik.org%2Flog-analytics%2F&urlref=https%3A%2F%2Fwww.google.co.jp%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D2%26ved%3D0CDAQFjAB%26url%3Dhttps%253A%252F%252Fpiwik.org%252Flog-analytics%252F%26ei%3DrogdU5OuK43pkgXZmYGICA%26usg%3DAFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg%26bvm%3Dbv.62578216%2Cd.dGI&_id=15164ceeb5ddb76f&_idts=1394444478&_idvc=4&_idn=0&_refts=1394670831&_viewts=1394584228&_ref=https%3A%2F%2Fwww.google.co.jp%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D2%26ved%3D0CDAQFjAB%26url%3Dhttps%253A%252F%252Fpiwik.org%252Flog-analytics%252F%26ei%3DrogdU5OuK43pkgXZmYGICA%26usg%3DAFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg%26bvm%3Dbv.62578216%2Cd.dGI&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=0&java=1&gears=0&ag=0&cookie=1&res=2560x1440&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "https://piwik.org/log-analytics/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" 108.211.181.12 - - [18/Aug/2012:01:33:55 +0100] "GET /piwik.php?action_name=Integrate%20Piwik%20into%20your%20Rails%20Application%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=006719&h=17&m=33&s=58&url=http%3A%2F%2Fpiwik.org%2Fblog%2F2012%2F10%2Fintegrate-piwik-into-your-rails-application%2F&urlref=https%3A%2F%2Fwww.google.com%2F&_id=3d9cad3fc284c272&_idts=1394670839&_idvc=1&_idn=1&_refts=1394670839&_viewts=1394670839&_ref=https%3A%2F%2Fwww.google.com%2F&pdf=1&qt=1&realp=0&wma=1&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1360x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=391 HTTP/1.1" 200 43 "http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.149 Safari/537.36" 50.244.17.130 - - [18/Aug/2012:01:33:59 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=658858&h=19&m=34&s=1&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&_id=90d89274a8c26d90&_idts=1394670841&_idvc=1&_idn=1&_refts=1394670841&_viewts=1394670841&_ref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=2880x1800&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9"