From a420410760ba2e92f0867ca7988c6a66e871d3bc Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Thu, 3 Jan 2013 06:41:41 +0000
Subject: [PATCH] Trying to fix build?
git-svn-id: http://dev.piwik.org/svn/trunk@7724 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
tests/PHPUnit/Integration/NonUnicodeTest.php | 6 +-
..._NonUnicode__Actions.getPageTitles_day.xml | 8 +-
...st_NonUnicode__Actions.getPageUrls_day.xml | 12 ++
...ode__Actions.getSiteSearchKeywords_day.xml | 7 +-
...Unicode__Live.getLastVisitsDetails_day.xml | 149 +++++-------------
...t_NonUnicode__Referers.getWebsites_day.xml | 28 ++--
6 files changed, 76 insertions(+), 134 deletions(-)
diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/Integration/NonUnicodeTest.php
index 89945fc388..c200ee4a38 100755
--- a/tests/PHPUnit/Integration/NonUnicodeTest.php
+++ b/tests/PHPUnit/Integration/NonUnicodeTest.php
@@ -46,6 +46,7 @@ class Test_Piwik_Integration_NonUnicodeTest extends IntegrationTestCase
'Actions.getPageUrls',
'Referers.getWebsites',
'Live.getLastVisitsDetails',
+ 'Actions.getLastVisitsDetails',
);
return array(
@@ -102,7 +103,6 @@ class Test_Piwik_Integration_NonUnicodeTest extends IntegrationTestCase
self::checkResponse($visitor->doTrackPageView('Site Search'));
$visitor->setForceVisitDateTime(Piwik_Date::factory(self::$dateTime)->addHour(0.5)->getDatetime());
-
//TESTS: on jenkins somehow the "<-was here" was cut off so removing this test case and simply append the wrong keyword
// $visitor->setUrl('http://example.org/page/index.htm?q=non unicode keyword %EC%E5%F8%EAe%EE%E2%FBf%E5 <-was here');
$visitor->setUrl('http://example.org/page/index.htm?q=non unicode keyword %EC%E5%F8%EA%EE%E2%FB%E5');
@@ -112,6 +112,10 @@ class Test_Piwik_Integration_NonUnicodeTest extends IntegrationTestCase
self::checkResponse($visitor->doTrackPageView('Site Search'));
$visitor->setPageCharset('');
+ $visitor->setForceVisitDateTime(Piwik_Date::factory(self::$dateTime)->addHour(0.55)->getDatetime());
+ $visitor->setUrl('http://example.org/exit-page');
+ self::checkResponse($visitor->doTrackPageView('Page title is always UTF-8'));
+
// Test invalid char set
$visitor = self::getTracker(self::$idSite1, self::$dateTime, $defaultInit = true);
$visitor->setForceVisitDateTime(Piwik_Date::factory(self::$dateTime)->addHour(1)->getDatetime());
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageTitles_day.xml b/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageTitles_day.xml
index 11c271fe53..53b4ba83cf 100755
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageTitles_day.xml
@@ -4,10 +4,10 @@
<label> Page title is always UTF-8</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
- <sum_time_spent>360</sum_time_spent>
- <nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>360</avg_time_on_page>
+ <nb_hits>2</nb_hits>
+ <sum_time_spent>1980</sum_time_spent>
+ <nb_hits_following_search>2</nb_hits_following_search>
+ <avg_time_on_page>1980</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageUrls_day.xml b/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageUrls_day.xml
index e3fc104f07..220e3a4778 100755
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getPageUrls_day.xml
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <label>/exit-page</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>1620</sum_time_spent>
+ <nb_hits_following_search>1</nb_hits_following_search>
+ <avg_time_on_page>1620</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>0%</exit_rate>
+ <url>http://example.org/exit-page</url>
+ </row>
<row>
<label>page</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml
index 4ea63379d2..42b11cd5b7 100755
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_NonUnicode__Actions.getSiteSearchKeywords_day.xml
@@ -15,12 +15,11 @@
<label>non unicode keyword </label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <exit_nb_visits>1</exit_nb_visits>
+ <sum_time_spent>180</sum_time_spent>
<nb_pages_per_search>1</nb_pages_per_search>
- <avg_time_on_page>0</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>100%</exit_rate>
+ <exit_rate>0%</exit_rate>
</row>
<row>
<label>Search 2ü</label>
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_NonUnicode__Live.getLastVisitsDetails_day.xml
index 7f2a9c5cfb..8fd89782a6 100644
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_NonUnicode__Live.getLastVisitsDetails_day.xml
@@ -1,96 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <idSite>1</idSite>
- <idVisit>2</idVisit>
- <visitIp>156.5.3.2</visitIp>
-
- <visitorType>returning</visitorType>
- <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
- <visitConverted>0</visitConverted>
- <visitConvertedIcon />
- <visitEcommerceStatus>none</visitEcommerceStatus>
- <visitEcommerceStatusIcon />
- <searches>1</searches>
- <actions>1</actions>
- <actionDetails>
- <row>
- <type>search</type>
- <url />
- <pageTitle>a keyword</pageTitle>
- <pageIdAction />
- <pageId>5</pageId>
-
- <customVariables>
- <row>
- <customVariableName4>Search Category</customVariableName4>
- <customVariableValue4>Search Kategory</customVariableValue4>
- </row>
- </customVariables>
- <icon>themes/default/images/search_ico.png</icon>
- </row>
- </actionDetails>
- <customVariables>
- </customVariables>
- <goalConversions>0</goalConversions>
- <siteCurrency>USD</siteCurrency>
- <siteCurrencySymbol>$</siteCurrencySymbol>
-
- <visitLocalTime>12:34:06</visitLocalTime>
-
-
-
- <visitDuration>0</visitDuration>
- <visitDurationPretty>0s</visitDurationPretty>
- <visitCount>1</visitCount>
- <daysSinceLastVisit>0</daysSinceLastVisit>
- <daysSinceFirstVisit>0</daysSinceFirstVisit>
- <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
- <continent>Europe</continent>
- <country>France</country>
- <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
- <region />
- <city />
- <location>France</location>
- <latitude />
- <longitude />
- <provider>Unknown</provider>
- <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
- <referrerType>website</referrerType>
- <referrerTypeName>Websites</referrerTypeName>
- <referrerName>anothersite.com</referrerName>
- <referrerKeyword />
- <referrerKeywordPosition />
- <referrerUrl>http://anothersite.com/whatever.html</referrerUrl>
- <referrerSearchEngineUrl />
- <referrerSearchEngineIcon />
- <operatingSystem>Windows XP</operatingSystem>
- <operatingSystemShortName>Win XP</operatingSystemShortName>
- <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <screenType>normal</screenType>
- <resolution>1024x768</resolution>
- <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
- <plugins>flash, java</plugins>
- <pluginsIcons>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
- <pluginName>flash</pluginName>
- </row>
- <row>
- <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
- <pluginName>java</pluginName>
- </row>
- </pluginsIcons>
-
-
-
-
-
- </row>
<row>
<idSite>1</idSite>
<idVisit>1</idVisit>
@@ -102,9 +11,20 @@
<visitConvertedIcon />
<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
- <searches>3</searches>
- <actions>4</actions>
+ <searches>4</searches>
+ <actions>6</actions>
<actionDetails>
+ <row>
+ <type>action</type>
+ <url>http://example.org/page/index.htm?whatever=%EC%E5%F8%EA%EE%E2%FB%E5</url>
+ <pageTitle>Page title is always UTF-8</pageTitle>
+ <pageIdAction>3</pageIdAction>
+ <pageId>2</pageId>
+
+ <timeSpent>360</timeSpent>
+ <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <icon />
+ </row>
<row>
<type>search</type>
<url />
@@ -122,17 +42,6 @@
<timeSpentPretty>0s</timeSpentPretty>
<icon>themes/default/images/search_ico.png</icon>
</row>
- <row>
- <type>action</type>
- <url>http://example.org/page/index.htm?whatever=%EC%E5%F8%EA%EE%E2%FB%E5</url>
- <pageTitle>Page title is always UTF-8</pageTitle>
- <pageIdAction>3</pageIdAction>
- <pageId>2</pageId>
-
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
- <icon />
- </row>
<row>
<type>search</type>
<url />
@@ -151,6 +60,34 @@
<pageIdAction />
<pageId>4</pageId>
+ <timeSpent>180</timeSpent>
+ <timeSpentPretty>3 min 0s</timeSpentPretty>
+ <icon>themes/default/images/search_ico.png</icon>
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://example.org/exit-page</url>
+ <pageTitle>Page title is always UTF-8</pageTitle>
+ <pageIdAction>6</pageIdAction>
+ <pageId>5</pageId>
+
+ <timeSpent>1620</timeSpent>
+ <timeSpentPretty>27 min 0s</timeSpentPretty>
+ <icon />
+ </row>
+ <row>
+ <type>search</type>
+ <url />
+ <pageTitle>a keyword</pageTitle>
+ <pageIdAction />
+ <pageId>6</pageId>
+
+ <customVariables>
+ <row>
+ <customVariableName4>Search Category</customVariableName4>
+ <customVariableValue4>Search Kategory</customVariableValue4>
+ </row>
+ </customVariables>
<icon>themes/default/images/search_ico.png</icon>
</row>
</actionDetails>
@@ -164,8 +101,8 @@
- <visitDuration>721</visitDuration>
- <visitDurationPretty>12 min 1s</visitDurationPretty>
+ <visitDuration>2521</visitDuration>
+ <visitDurationPretty>42 min 1s</visitDurationPretty>
<visitCount>1</visitCount>
<daysSinceLastVisit>0</daysSinceLastVisit>
<daysSinceFirstVisit>0</daysSinceFirstVisit>
diff --git a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referers.getWebsites_day.xml b/tests/PHPUnit/Integration/expected/test_NonUnicode__Referers.getWebsites_day.xml
index 8567cbf316..a9317aa894 100755
--- a/tests/PHPUnit/Integration/expected/test_NonUnicode__Referers.getWebsites_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_NonUnicode__Referers.getWebsites_day.xml
@@ -2,31 +2,21 @@
<result>
<row>
<label>anothersite.com</label>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>4</max_actions>
- <sum_visit_length>721</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>6</nb_actions>
+ <max_actions>6</max_actions>
+ <sum_visit_length>2521</sum_visit_length>
+ <bounce_count>0</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
<subtable>
- <row>
- <label>http://anothersite.com/whatever.html</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
<row>
<label>http://anothersite.com/whatever.html?whatever=Ato</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
- <nb_actions>4</nb_actions>
- <max_actions>4</max_actions>
- <sum_visit_length>721</sum_visit_length>
+ <nb_actions>6</nb_actions>
+ <max_actions>6</max_actions>
+ <sum_visit_length>2521</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
</row>
--
GitLab