diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-03-13 06:28:08 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-03-13 06:28:08 +0400 |
| commit | fd13666a79962545ac878e4a18d5909ac3923eb8 (patch) | |
| tree | 9eb280dd002d7f997b1f362a96b2f65690974df3 | |
| parent | b6dfdc06e084f46668c679f0110e5a67146cef43 (diff) | |
Refs #3632 Creating a test case: same visitor (same IP + idvisitor) visits the website on two different days.
Visitors on second day is marked as "new" because window_look_back_for_visitor is not set.
53 files changed, 528 insertions, 415 deletions
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml index 3e63bec8a8..8482e75ec2 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -4,20 +4,20 @@ <label> Liberate Web Analytics - Analytics - Piwik</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> - <sum_time_spent>40</sum_time_spent> + <sum_time_spent>34</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.058</min_time_generation> <max_time_generation>0.292</max_time_generation> <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>8</entry_nb_actions> - <entry_sum_visit_length>51</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> + <entry_nb_actions>7</entry_nb_actions> + <entry_sum_visit_length>44</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>10</avg_time_on_page> - <bounce_rate>25%</bounce_rate> + <avg_time_on_page>9</avg_time_on_page> + <bounce_rate>50%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.177</avg_time_generation> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 17b69f2819..283ef2b791 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -354,21 +354,21 @@ <label>/index</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> - <sum_time_spent>40</sum_time_spent> + <sum_time_spent>34</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.058</min_time_generation> <max_time_generation>0.292</max_time_generation> <entry_nb_visits>6</entry_nb_visits> - <entry_nb_actions>10</entry_nb_actions> - <entry_sum_visit_length>51</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_nb_actions>9</entry_nb_actions> + <entry_sum_visit_length>44</entry_sum_visit_length> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>7</avg_time_on_page> - <bounce_rate>50%</bounce_rate> - <exit_rate>50%</exit_rate> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>6</avg_time_on_page> + <bounce_rate>67%</bounce_rate> + <exit_rate>67%</exit_rate> <avg_time_generation>0.177</avg_time_generation> <url>http://piwik.net/</url> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml index ecd4b31c50..7a9395ac44 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -4,20 +4,20 @@ <label> Liberate Web Analytics - Analytics - Piwik</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> - <sum_time_spent>40</sum_time_spent> + <sum_time_spent>34</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.058</min_time_generation> <max_time_generation>0.292</max_time_generation> <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>8</entry_nb_actions> - <entry_sum_visit_length>51</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> + <entry_nb_actions>7</entry_nb_actions> + <entry_sum_visit_length>44</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>10</avg_time_on_page> - <bounce_rate>25%</bounce_rate> + <avg_time_on_page>9</avg_time_on_page> + <bounce_rate>50%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.177</avg_time_generation> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 986aa68207..3bebd593bf 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -354,21 +354,21 @@ <label>/index</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> - <sum_time_spent>40</sum_time_spent> + <sum_time_spent>34</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.058</min_time_generation> <max_time_generation>0.292</max_time_generation> <entry_nb_visits>6</entry_nb_visits> - <entry_nb_actions>10</entry_nb_actions> - <entry_sum_visit_length>51</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_nb_actions>9</entry_nb_actions> + <entry_sum_visit_length>44</entry_sum_visit_length> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>7</avg_time_on_page> - <bounce_rate>50%</bounce_rate> - <exit_rate>50%</exit_rate> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>6</avg_time_on_page> + <bounce_rate>67%</bounce_rate> + <exit_rate>67%</exit_rate> <avg_time_generation>0.177</avg_time_generation> <url>http://piwik.net/</url> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml index d7df2dd939..d03b4e81bb 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml @@ -5,6 +5,10 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <subtable> <row> @@ -12,8 +16,13 @@ <nb_visits>1</nb_visits> <nb_hits>1</nb_hits> <sum_time_spent>0</sum_time_spent> + <entry_nb_visits>1</entry_nb_visits> + <entry_nb_actions>1</entry_nb_actions> + <entry_sum_visit_length>0</entry_sum_visit_length> + <entry_bounce_count>1</entry_bounce_count> <exit_nb_visits>1</exit_nb_visits> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors> <url>http://demo.piwik.org/</url> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml index c5dfd4d99b..61ef03022a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -18,20 +18,20 @@ <label> Liberate Web Analytics - Analytics - Piwik</label> <nb_visits>4</nb_visits> <nb_hits>4</nb_hits> - <sum_time_spent>40</sum_time_spent> + <sum_time_spent>34</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.058</min_time_generation> <max_time_generation>0.292</max_time_generation> <entry_nb_visits>4</entry_nb_visits> - <entry_nb_actions>8</entry_nb_actions> - <entry_sum_visit_length>51</entry_sum_visit_length> - <entry_bounce_count>1</entry_bounce_count> + <entry_nb_actions>7</entry_nb_actions> + <entry_sum_visit_length>44</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> <exit_nb_visits>2</exit_nb_visits> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>4</sum_daily_entry_nb_uniq_visitors> <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>10</avg_time_on_page> - <bounce_rate>25%</bounce_rate> + <avg_time_on_page>9</avg_time_on_page> + <bounce_rate>50%</bounce_rate> <exit_rate>50%</exit_rate> <avg_time_generation>0.177</avg_time_generation> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml index 7318f199a1..439e7e6105 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -354,21 +354,21 @@ <label>/index</label> <nb_visits>6</nb_visits> <nb_hits>6</nb_hits> - <sum_time_spent>40</sum_time_spent> + <sum_time_spent>34</sum_time_spent> <nb_hits_with_time_generation>3</nb_hits_with_time_generation> <min_time_generation>0.058</min_time_generation> <max_time_generation>0.292</max_time_generation> <entry_nb_visits>6</entry_nb_visits> - <entry_nb_actions>10</entry_nb_actions> - <entry_sum_visit_length>51</entry_sum_visit_length> - <entry_bounce_count>3</entry_bounce_count> - <exit_nb_visits>3</exit_nb_visits> + <entry_nb_actions>9</entry_nb_actions> + <entry_sum_visit_length>44</entry_sum_visit_length> + <entry_bounce_count>4</entry_bounce_count> + <exit_nb_visits>4</exit_nb_visits> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_entry_nb_uniq_visitors>6</sum_daily_entry_nb_uniq_visitors> - <sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors> - <avg_time_on_page>7</avg_time_on_page> - <bounce_rate>50%</bounce_rate> - <exit_rate>50%</exit_rate> + <sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>6</avg_time_on_page> + <bounce_rate>67%</bounce_rate> + <exit_rate>67%</exit_rate> <avg_time_generation>0.177</avg_time_generation> <url>http://piwik.net/</url> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index b46d7c8d41..87a36dc1b1 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,11 +2,11 @@ <result> <row> <label>Domain landed</label> - <nb_visits>11</nb_visits> + <nb_visits>12</nb_visits> <nb_actions>16</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>132</sum_visit_length> - <bounce_count>7</bounce_count> + <sum_visit_length>125</sum_visit_length> + <bounce_count>9</bounce_count> <goals> <row idgoal='1'> <nb_conversions>11</nb_conversions> @@ -16,15 +16,15 @@ </goals> <nb_conversions>11</nb_conversions> <revenue>55</revenue> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <subtable> <row> <label>piwik.org</label> - <nb_visits>11</nb_visits> + <nb_visits>12</nb_visits> <nb_actions>16</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>132</sum_visit_length> - <bounce_count>7</bounce_count> + <sum_visit_length>125</sum_visit_length> + <bounce_count>9</bounce_count> <goals> <row idgoal='1'> <nb_conversions>11</nb_conversions> @@ -34,7 +34,7 @@ </goals> <nb_conversions>11</nb_conversions> <revenue>55</revenue> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 42229f986a..3151d8bdcf 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>36</nb_visits> + <nb_visits>37</nb_visits> <nb_actions>44</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>437</sum_visit_length> - <bounce_count>30</bounce_count> + <sum_visit_length>430</sum_visit_length> + <bounce_count>32</bounce_count> <nb_visits_converted>34</nb_visits_converted> - <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors> <logo>plugins/DevicesDetection/images/brand/unknown.ico</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index ca72d70ce0..486584b6cc 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Chrome</label> - <nb_visits>15</nb_visits> + <nb_visits>16</nb_visits> <nb_actions>19</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>312</sum_visit_length> - <bounce_count>12</bounce_count> + <sum_visit_length>305</sum_visit_length> + <bounce_count>14</bounce_count> <nb_visits_converted>14</nb_visits_converted> - <sum_daily_nb_uniq_visitors>15</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index b9a34879ae..05aacf6b01 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Chrome 33.0</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> <label>Epiphany 2.30</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -34,17 +45,6 @@ <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Chrome 33.0</label> - <nb_visits>4</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - </row> - <row> <label>Firefox 27.0</label> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 30a2c0b191..6135f1fa60 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>36</nb_visits> + <nb_visits>37</nb_visits> <nb_actions>44</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>437</sum_visit_length> - <bounce_count>30</bounce_count> + <sum_visit_length>430</sum_visit_length> + <bounce_count>32</bounce_count> <nb_visits_converted>34</nb_visits_converted> - <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors> </row> <row> <label>Vision</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 9914b04ba2..44393b8b12 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Windows</label> - <nb_visits>16</nb_visits> + <nb_visits>17</nb_visits> <nb_actions>20</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>98</sum_visit_length> - <bounce_count>13</bounce_count> + <sum_visit_length>91</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>16</nb_visits_converted> - <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 6cfffff154..306f0cad9d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Windows 7</label> - <nb_visits>12</nb_visits> + <nb_visits>13</nb_visits> <nb_actions>14</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>88</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>81</sum_visit_length> + <bounce_count>12</bounce_count> <nb_visits_converted>12</nb_visits_converted> - <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>13</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 9f0ba2794b..c315c8397b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Desktop</label> - <nb_visits>36</nb_visits> + <nb_visits>37</nb_visits> <nb_actions>44</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>437</sum_visit_length> - <bounce_count>30</bounce_count> + <sum_visit_length>430</sum_visit_length> + <bounce_count>32</bounce_count> <nb_visits_converted>34</nb_visits_converted> - <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml index 65648cad8c..2037491b8f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml @@ -2,6 +2,6 @@ <result> <nb_conversions>36</nb_conversions> <nb_visits_converted>36</nb_visits_converted> - <conversion_rate>94.74</conversion_rate> + <conversion_rate>92.31</conversion_rate> <revenue>180</revenue> </result>
\ No newline at end of file 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 daaf9889db..50b207b2a6 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml @@ -2,7 +2,7 @@ <result> <row> <idSite>1</idSite> - <idVisit>39</idVisit> + <idVisit>40</idVisit> <visitIp>174.97.139.63</visitIp> <visitorType>new</visitorType> @@ -117,7 +117,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>32</idVisit> + <idVisit>33</idVisit> <visitIp>206.190.75.8</visitIp> <visitorType>returning</visitorType> @@ -136,7 +136,7 @@ <pageTitle>Changelog Archive - Analytics - Piwik</pageTitle> <pageIdAction>43</pageIdAction> - <pageId>37</pageId> + <pageId>38</pageId> <timeSpent>79</timeSpent> <timeSpentPretty>1 min 19s</timeSpentPretty> <icon /> @@ -146,7 +146,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>37</goalPageId> + <goalPageId>38</goalPageId> <url>http://piwik.org/changelog/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -229,7 +229,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>38</idVisit> + <idVisit>39</idVisit> <visitIp>193.159.20.129</visitIp> <visitorType>new</visitorType> @@ -356,11 +356,11 @@ </row> <row> <idSite>1</idSite> - <idVisit>36</idVisit> + <idVisit>37</idVisit> <visitIp>50.244.17.130</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -375,7 +375,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>34</pageIdAction> - <pageId>41</pageId> + <pageId>42</pageId> <timeSpent>32</timeSpent> <timeSpentPretty>32s</timeSpentPretty> <icon /> @@ -385,7 +385,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>41</goalPageId> + <goalPageId>42</goalPageId> <url>http://piwik.org/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -419,7 +419,7 @@ <visitDuration>34</visitDuration> <visitDurationPretty>34s</visitDurationPretty> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + <daysSinceLastVisit>7</daysSinceLastVisit> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>North America</continent> @@ -485,42 +485,20 @@ </row> <row> <idSite>1</idSite> - <idVisit>37</idVisit> + <idVisit>38</idVisit> <visitIp>84.194.72.21</visitIp> <visitorType>new</visitorType> <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> <events>0</events> - <actions>2</actions> + <actions>1</actions> <actionDetails> <row> - <type>action</type> - <url>http://piwik.org/</url> - <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> - <pageIdAction>34</pageIdAction> - - <pageId>42</pageId> - <generationTime>0.06s</generationTime> - <timeSpent>6</timeSpent> - <timeSpentPretty>6s</timeSpentPretty> - <icon /> - </row> - <row> - <type>goal</type> - <goalName>all</goalName> - <goalId>1</goalId> - <revenue>5</revenue> - <goalPageId>42</goalPageId> - - <url>http://piwik.org/</url> - <icon>plugins/Zeitgeist/images/goal.png</icon> - </row> - <row> <type>outlink</type> <url>http://demo.piwik.org/</url> <pageTitle /> @@ -536,18 +514,18 @@ <customVariableValue1>piwik.org</customVariableValue1> </row> </customVariables> - <goalConversions>1</goalConversions> + <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>01:34:18</visitLocalTime> + <visitLocalTime>01:34:24</visitLocalTime> <visitLocalHour>1</visitLocalHour> - <visitDuration>7</visitDuration> - <visitDurationPretty>7s</visitDurationPretty> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> <visitCount>1</visitCount> <daysSinceLastVisit>0</daysSinceLastVisit> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -615,7 +593,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>35</idVisit> + <idVisit>36</idVisit> <visitIp>108.211.181.12</visitIp> <visitorType>new</visitorType> @@ -633,7 +611,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>40</goalPageId> + <goalPageId>41</goalPageId> <url>http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -644,7 +622,7 @@ <pageTitle>Integrate Piwik into your Rails Application - Analytics - Piwik</pageTitle> <pageIdAction>47</pageIdAction> - <pageId>40</pageId> + <pageId>41</pageId> <generationTime>0.39s</generationTime> <icon /> </row> @@ -742,7 +720,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>34</idVisit> + <idVisit>35</idVisit> <visitIp>219.101.46.222</visitIp> <visitorType>returning</visitorType> @@ -760,7 +738,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>39</goalPageId> + <goalPageId>40</goalPageId> <url>https://piwik.org/log-analytics/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -771,7 +749,7 @@ <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> <pageIdAction>41</pageIdAction> - <pageId>39</pageId> + <pageId>40</pageId> <icon /> </row> </actionDetails> @@ -856,7 +834,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>33</idVisit> + <idVisit>34</idVisit> <visitIp>80.136.160.65</visitIp> <visitorType>returning</visitorType> @@ -874,7 +852,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>38</goalPageId> + <goalPageId>39</goalPageId> <url>http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -885,7 +863,7 @@ <pageTitle>Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik</pageTitle> <pageIdAction>45</pageIdAction> - <pageId>38</pageId> + <pageId>39</pageId> <generationTime>0.12s</generationTime> <icon /> </row> @@ -963,7 +941,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>31</idVisit> + <idVisit>32</idVisit> <visitIp>188.107.238.9</visitIp> <visitorType>new</visitorType> @@ -981,7 +959,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>36</goalPageId> + <goalPageId>37</goalPageId> <url>http://piwik.org/log-analytics/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -992,7 +970,7 @@ <pageTitle>Log Analytics - Analytics - Piwik</pageTitle> <pageIdAction>41</pageIdAction> - <pageId>36</pageId> + <pageId>37</pageId> <generationTime>0.15s</generationTime> <icon /> </row> @@ -1090,7 +1068,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>29</idVisit> + <idVisit>30</idVisit> <visitIp>93.80.130.163</visitIp> <visitorType>new</visitorType> @@ -1109,7 +1087,7 @@ <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> <pageIdAction>34</pageIdAction> - <pageId>32</pageId> + <pageId>33</pageId> <generationTime>0.18s</generationTime> <timeSpent>2</timeSpent> <timeSpentPretty>2s</timeSpentPretty> @@ -1120,7 +1098,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>32</goalPageId> + <goalPageId>33</goalPageId> <url>http://piwik.org/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -1131,7 +1109,7 @@ <pageTitle>Download - Analytics - Piwik</pageTitle> <pageIdAction>38</pageIdAction> - <pageId>34</pageId> + <pageId>35</pageId> <generationTime>0.11s</generationTime> <timeSpent>7</timeSpent> <timeSpentPretty>7s</timeSpentPretty> @@ -1143,7 +1121,7 @@ <pageTitle /> <pageIdAction>39</pageIdAction> - <pageId>35</pageId> + <pageId>36</pageId> <icon>plugins/Zeitgeist/images/download.png</icon> </row> </actionDetails> @@ -1224,7 +1202,7 @@ </row> <row> <idSite>1</idSite> - <idVisit>30</idVisit> + <idVisit>31</idVisit> <visitIp>176.41.226.154</visitIp> <visitorType>returning</visitorType> @@ -1242,7 +1220,7 @@ <goalName>all</goalName> <goalId>1</goalId> <revenue>5</revenue> - <goalPageId>33</goalPageId> + <goalPageId>34</goalPageId> <url>http://piwik.org/docs/installation/</url> <icon>plugins/Zeitgeist/images/goal.png</icon> @@ -1253,7 +1231,7 @@ <pageTitle>Installing Piwik - Analytics - Piwik</pageTitle> <pageIdAction>36</pageIdAction> - <pageId>33</pageId> + <pageId>34</pageId> <generationTime>0.13s</generationTime> <icon /> </row> @@ -1343,6 +1321,125 @@ </row> <row> <idSite>1</idSite> + <idVisit>29</idVisit> + <visitIp>84.194.72.21</visitIp> + + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <searches>0</searches> + <events>0</events> + <actions>1</actions> + <actionDetails> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>32</goalPageId> + + <url>http://piwik.org/</url> + <icon>plugins/Zeitgeist/images/goal.png</icon> + </row> + <row> + <type>action</type> + <url>http://piwik.org/</url> + <pageTitle>Liberate Web Analytics - Analytics - Piwik</pageTitle> + <pageIdAction>34</pageIdAction> + + <pageId>32</pageId> + <generationTime>0.06s</generationTime> + <icon /> + </row> + </actionDetails> + <customVariables> + <row> + <customVariableName1>Domain landed</customVariableName1> + <customVariableValue1>piwik.org</customVariableValue1> + </row> + </customVariables> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + <visitLocalTime>01:34:18</visitLocalTime> + <visitLocalHour>1</visitLocalHour> + + + + + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <visitCount>1</visitCount> + <daysSinceLastVisit>0</daysSinceLastVisit> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>Belgium</country> + <countryCode>be</countryCode> + <countryFlag>plugins/UserCountry/images/flags/be.png</countryFlag> + <region>Limburg</region> + <regionCode>05</regionCode> + <city>Maaseik</city> + <location>Maaseik, Limburg, Belgium</location> + <latitude>51.099998</latitude> + <longitude>5.800000</longitude> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>website</referrerType> + <referrerTypeName>Websites</referrerTypeName> + <referrerName>musicforeveryoneradio.be</referrerName> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</referrerUrl> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <operatingSystem>Windows 7</operatingSystem> + <operatingSystemCode>WI7</operatingSystemCode> + <operatingSystemShortName>Win 7</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon> + <browserFamily>webkit</browserFamily> + <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserName>Chrome 33.0</browserName> + <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> + <browserCode>CH</browserCode> + <browserVersion>33.0</browserVersion> + <screenType>wide</screenType> + <deviceType>Desktop</deviceType> + <resolution>1920x1080</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> + <plugins>pdf, flash, java, silverlight</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/pdf.gif</pluginIcon> + <pluginName>pdf</pluginName> + </row> + <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> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/silverlight.gif</pluginIcon> + <pluginName>silverlight</pluginName> + </row> + </pluginsIcons> + + + + + + </row> + <row> + <idSite>1</idSite> <idVisit>26</idVisit> <visitIp>0.0.0.0</visitIp> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml index 1219929b33..358869c437 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>Piwik test</label> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> <nb_actions>46</nb_actions> <nb_pageviews>40</nb_pageviews> <revenue>180</revenue> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml index 1d06c0cc4c..f04a57ef02 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> <nb_actions>46</nb_actions> <visits_evolution>100%</visits_evolution> <actions_evolution>100%</actions_evolution> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml index 9cf3e0e9f7..a6516309e5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Unknown</label> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> <nb_actions>46</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>437</sum_visit_length> - <bounce_count>32</bounce_count> + <sum_visit_length>430</sum_visit_length> + <bounce_count>34</bounce_count> <nb_visits_converted>36</nb_visits_converted> - <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors> <url>http://piwik.org/faq/general/#faq_52</url> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml index 496802df19..d6dd56e988 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -72,12 +72,12 @@ <referer_type>3</referer_type> </row> <row> - <label>musicforeveryoneradio.be</label> + <label>forum.golem.de</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -91,7 +91,7 @@ <referer_type>3</referer_type> </row> <row> - <label>blog.comperiosearch.com</label> + <label>berndjung.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -110,7 +110,7 @@ <referer_type>3</referer_type> </row> <row> - <label>forum.golem.de</label> + <label>blog.comperiosearch.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -129,12 +129,12 @@ <referer_type>3</referer_type> </row> <row> - <label>berndjung.com</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>musicforeveryoneradio.be</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -144,7 +144,8 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <referer_type>3</referer_type> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index cf6b4d7eae..1a409ad5cf 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -20,11 +20,11 @@ </row> <row> <label>Websites</label> - <nb_visits>6</nb_visits> + <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>5</bounce_count> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>7</bounce_count> <goals> <row idgoal='1'> <nb_conversions>7</nb_conversions> @@ -34,15 +34,15 @@ </goals> <nb_conversions>7</nb_conversions> <revenue>35</revenue> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <subtable> <row> - <label>berndjung.com</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>musicforeveryoneradio.be</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -52,10 +52,11 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> - <label>blog.comperiosearch.com</label> + <label>berndjung.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -73,7 +74,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> <row> - <label>forum.golem.de</label> + <label>blog.comperiosearch.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -91,12 +92,12 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> <row> - <label>musicforeveryoneradio.be</label> + <label>forum.golem.de</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml index 7181d1905a..7f61ae72cd 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>berndjung.com</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>musicforeveryoneradio.be</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -16,22 +16,23 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <subtable> <row> - <label>http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> + <label>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> </subtable> </row> <row> - <label>blog.comperiosearch.com</label> + <label>berndjung.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -49,7 +50,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <subtable> <row> - <label>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</label> + <label>http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -61,7 +62,7 @@ </subtable> </row> <row> - <label>forum.golem.de</label> + <label>blog.comperiosearch.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -79,7 +80,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <subtable> <row> - <label>http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html</label> + <label>http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> @@ -91,12 +92,12 @@ </subtable> </row> <row> - <label>musicforeveryoneradio.be</label> + <label>forum.golem.de</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -109,12 +110,12 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <subtable> <row> - <label>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</label> + <label>http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> + <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>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> @@ -196,11 +197,11 @@ <row> <label>http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw</label> <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <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> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> </subtable> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml index 46f95ffdb2..23c0b5749b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -52,6 +52,33 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> </row> <row> + <label>Maaseik, Limburg, Belgium</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <lat>51.1</lat> + <long>5.8</long> + <city_name>Maaseik</city_name> + <region>05</region> + <country>be</country> + <country_name>Belgium</country_name> + <region_name>Limburg</region_name> + <logo>plugins/UserCountry/images/flags/be.png</logo> + </row> + <row> <label>Esentepe, Rize, Turkey</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> @@ -104,32 +131,6 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> </row> <row> - <label>Maaseik, Limburg, Belgium</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>5</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <lat>51.1</lat> - <long>5.8</long> - <city_name>Maaseik</city_name> - <region>05</region> - <country>be</country> - <country_name>Belgium</country_name> - <region_name>Limburg</region_name> - <logo>plugins/UserCountry/images/flags/be.png</logo> - </row> - <row> <label>Mainz, Rheinland-Pfalz, Germany</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 26b2965c04..4b973c6381 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -78,11 +78,11 @@ </row> <row> <label>Europe</label> - <nb_visits>6</nb_visits> + <nb_visits>7</nb_visits> <nb_actions>9</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>17</sum_visit_length> - <bounce_count>4</bounce_count> + <sum_visit_length>10</sum_visit_length> + <bounce_count>6</bounce_count> <goals> <row idgoal='1'> <nb_conversions>6</nb_conversions> @@ -92,7 +92,8 @@ </goals> <nb_conversions>6</nb_conversions> <revenue>30</revenue> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <nb_visits_converted>0</nb_visits_converted> <code>Europe</code> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 2b12e5049e..2febd04aa7 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -111,26 +111,12 @@ <logoHeight>11</logoHeight> </row> <row> - <label>Australia</label> - <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> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <code>au</code> - <logo>plugins/UserCountry/images/flags/au.png</logo> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> - </row> - <row> <label>Belgium</label> - <nb_visits>1</nb_visits> + <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -140,13 +126,28 @@ </goals> <nb_conversions>1</nb_conversions> <revenue>5</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>be</code> <logo>plugins/UserCountry/images/flags/be.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> <row> + <label>Australia</label> + <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> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <code>au</code> + <logo>plugins/UserCountry/images/flags/au.png</logo> + <logoWidth>16</logoWidth> + <logoHeight>11</logoHeight> + </row> + <row> <label>Russian Federation</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 6c94303203..a47b34141d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -47,6 +47,30 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> </row> <row> + <label>Limburg, Belgium</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <region>05</region> + <country>be</country> + <country_name>Belgium</country_name> + <region_name>Limburg</region_name> + <logo>plugins/UserCountry/images/flags/be.png</logo> + </row> + <row> <label>California, United States</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> @@ -70,29 +94,6 @@ <logo>plugins/UserCountry/images/flags/us.png</logo> </row> <row> - <label>Limburg, Belgium</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>5</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <region>05</region> - <country>be</country> - <country_name>Belgium</country_name> - <region_name>Limburg</region_name> - <logo>plugins/UserCountry/images/flags/be.png</logo> - </row> - <row> <label>Nordrhein-Westfalen, Germany</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index 8e0b767a5a..b222db9348 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>WebKit (Safari, Chrome)</label> - <nb_visits>17</nb_visits> + <nb_visits>18</nb_visits> <nb_actions>19</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>41</sum_visit_length> - <bounce_count>15</bounce_count> + <sum_visit_length>34</sum_visit_length> + <bounce_count>17</bounce_count> <nb_visits_converted>17</nb_visits_converted> - <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors> <shortLabel>Webkit</shortLabel> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 76d895059f..f1ee8f770b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -1,6 +1,18 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Chrome 33.0</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>4</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <shortLabel>Chrome 33.0</shortLabel> + </row> + <row> <label>Epiphany 2.30</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -37,18 +49,6 @@ <shortLabel>RockMelt 0.9</shortLabel> </row> <row> - <label>Chrome 33.0</label> - <nb_visits>4</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 33.0</shortLabel> - </row> - <row> <label>Firefox 27.0</label> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 1d3ee47261..807d9c3032 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Chrome</label> + <nb_visits>11</nb_visits> + <nb_actions>11</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>11</bounce_count> + <nb_visits_converted>10</nb_visits_converted> + <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + </row> + <row> <label>Epiphany</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> @@ -34,17 +45,6 @@ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> - <label>Chrome</label> - <nb_visits>10</nb_visits> - <nb_actions>11</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>9</bounce_count> - <nb_visits_converted>10</nb_visits_converted> - <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - </row> - <row> <label>Firefox</label> <nb_visits>5</nb_visits> <nb_actions>7</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index 20aac30060..590b487471 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -51,6 +51,16 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> + <label>Windows 7 / Chrome / 1920x1080</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + </row> + <row> <label>Windows 7 / Chrome / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -151,16 +161,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> <row> - <label>Windows 7 / Chrome / 1920x1080</label> - <nb_visits>1</nb_visits> - <nb_actions>2</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - </row> - <row> <label>Windows 7 / Chrome / 1920x1200</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml index d284896ef7..4c8ddc785d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -2,12 +2,12 @@ <result> <row> <label>Unknown</label> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> <nb_actions>46</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>437</sum_visit_length> - <bounce_count>32</bounce_count> + <sum_visit_length>430</sum_visit_length> + <bounce_count>34</bounce_count> <nb_visits_converted>36</nb_visits_converted> - <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 5a2c56517d..a93a160b3d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Desktop</label> - <nb_visits>33</nb_visits> + <nb_visits>34</nb_visits> <nb_actions>41</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>437</sum_visit_length> - <bounce_count>27</bounce_count> + <sum_visit_length>430</sum_visit_length> + <bounce_count>29</bounce_count> <nb_visits_converted>32</nb_visits_converted> - <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/screens/normal.gif</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index ee2a07f8bc..a6f40cf25c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Windows</label> - <nb_visits>16</nb_visits> + <nb_visits>17</nb_visits> <nb_actions>20</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>98</sum_visit_length> - <bounce_count>13</bounce_count> + <sum_visit_length>91</sum_visit_length> + <bounce_count>15</bounce_count> <nb_visits_converted>16</nb_visits_converted> - <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/WI8.gif</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml index dc25735778..07514ed96d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Windows 7</label> - <nb_visits>12</nb_visits> + <nb_visits>13</nb_visits> <nb_actions>14</nb_actions> <max_actions>2</max_actions> - <sum_visit_length>88</sum_visit_length> - <bounce_count>10</bounce_count> + <sum_visit_length>81</sum_visit_length> + <bounce_count>12</bounce_count> <nb_visits_converted>12</nb_visits_converted> - <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>13</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/WI7.gif</logo> <shortLabel>Win 7</shortLabel> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml index fa541b9395..9f89195639 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -2,56 +2,56 @@ <result> <row> <label>Cookie</label> - <nb_visits>12</nb_visits> - <nb_visits_percentage>38.7%</nb_visits_percentage> + <nb_visits>13</nb_visits> + <nb_visits_percentage>40.6%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/cookie.gif</logo> </row> <row> <label>Flash</label> - <nb_visits>11</nb_visits> - <nb_visits_percentage>35.5%</nb_visits_percentage> + <nb_visits>12</nb_visits> + <nb_visits_percentage>37.5%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/flash.gif</logo> </row> <row> <label>Java</label> - <nb_visits>11</nb_visits> - <nb_visits_percentage>35.5%</nb_visits_percentage> + <nb_visits>12</nb_visits> + <nb_visits_percentage>37.5%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/java.gif</logo> </row> <row> <label>Pdf</label> - <nb_visits>9</nb_visits> - <nb_visits_percentage>29%</nb_visits_percentage> + <nb_visits>10</nb_visits> + <nb_visits_percentage>31.3%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/pdf.gif</logo> </row> <row> - <label>Quicktime</label> - <nb_visits>5</nb_visits> - <nb_visits_percentage>16.1%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/quicktime.gif</logo> + <label>Silverlight</label> + <nb_visits>6</nb_visits> + <nb_visits_percentage>18.8%</nb_visits_percentage> + <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo> </row> <row> - <label>Silverlight</label> + <label>Quicktime</label> <nb_visits>5</nb_visits> - <nb_visits_percentage>16.1%</nb_visits_percentage> - <logo>plugins/UserSettings/images/plugins/silverlight.gif</logo> + <nb_visits_percentage>15.6%</nb_visits_percentage> + <logo>plugins/UserSettings/images/plugins/quicktime.gif</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>3</nb_visits> - <nb_visits_percentage>9.7%</nb_visits_percentage> + <nb_visits_percentage>9.4%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/windowsmedia.gif</logo> </row> <row> <label>Director</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3.2%</nb_visits_percentage> + <nb_visits_percentage>3.1%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/director.gif</logo> </row> <row> <label>Gears</label> <nb_visits>1</nb_visits> - <nb_visits_percentage>3.2%</nb_visits_percentage> + <nb_visits_percentage>3.1%</nb_visits_percentage> <logo>plugins/UserSettings/images/plugins/gears.gif</logo> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml index 31ce7068bb..6074f6e1cc 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -11,6 +11,16 @@ <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> </row> <row> + <label>1920x1080</label> + <nb_visits>3</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>10</sum_visit_length> + <bounce_count>2</bounce_count> + <nb_visits_converted>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + </row> + <row> <label>1366x768</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -21,16 +31,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> - <label>1920x1080</label> - <nb_visits>2</nb_visits> - <nb_actions>5</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>17</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - </row> - <row> <label>2560x1440</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml index bdb3caca90..bc90fedd6c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml @@ -13,13 +13,13 @@ </row> <row> <label>Wide</label> - <nb_visits>11</nb_visits> + <nb_visits>12</nb_visits> <nb_actions>16</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>132</sum_visit_length> - <bounce_count>7</bounce_count> + <sum_visit_length>125</sum_visit_length> + <bounce_count>9</bounce_count> <nb_visits_converted>11</nb_visits_converted> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/screens/wide.gif</logo> </row> <row> 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 d74050dd49..83b8cf01eb 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 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_uniq_visitors_returning>5</nb_uniq_visitors_returning> - <nb_visits_returning>5</nb_visits_returning> - <nb_actions_returning>6</nb_actions_returning> - <nb_visits_converted_returning>5</nb_visits_converted_returning> + <nb_uniq_visitors_returning>6</nb_uniq_visitors_returning> + <nb_visits_returning>6</nb_visits_returning> + <nb_actions_returning>8</nb_actions_returning> + <nb_visits_converted_returning>6</nb_visits_converted_returning> <bounce_count_returning>4</bounce_count_returning> - <sum_visit_length_returning>81</sum_visit_length_returning> + <sum_visit_length_returning>115</sum_visit_length_returning> <max_actions_returning>2</max_actions_returning> - <bounce_rate_returning>80%</bounce_rate_returning> - <nb_actions_per_visit_returning>1.2</nb_actions_per_visit_returning> - <avg_time_on_site_returning>16</avg_time_on_site_returning> + <bounce_rate_returning>67%</bounce_rate_returning> + <nb_actions_per_visit_returning>1.3</nb_actions_per_visit_returning> + <avg_time_on_site_returning>19</avg_time_on_site_returning> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index eb3184645b..a2500cddf0 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -32,22 +32,22 @@ </row> <row> <label>Friday</label> - <nb_visits>6</nb_visits> - <nb_uniq_visitors>6</nb_uniq_visitors> - <nb_actions>6</nb_actions> + <nb_visits>7</nb_visits> + <nb_uniq_visitors>7</nb_uniq_visitors> + <nb_actions>7</nb_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>6</bounce_count> - <nb_visits_converted>6</nb_visits_converted> + <bounce_count>7</bounce_count> + <nb_visits_converted>7</nb_visits_converted> <day_of_week>5</day_of_week> </row> <row> <label>Saturday</label> <nb_visits>21</nb_visits> <nb_uniq_visitors>21</nb_uniq_visitors> - <nb_actions>29</nb_actions> - <sum_visit_length>437</sum_visit_length> - <bounce_count>15</bounce_count> - <nb_visits_converted>19</nb_visits_converted> + <nb_actions>28</nb_actions> + <sum_visit_length>430</sum_visit_length> + <bounce_count>16</bounce_count> + <nb_visits_converted>18</nb_visits_converted> <day_of_week>6</day_of_week> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index 9070b638bc..47b4378814 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -12,13 +12,13 @@ </row> <row> <label>1h</label> - <nb_visits>4</nb_visits> + <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <max_actions>2</max_actions> - <sum_visit_length>7</sum_visit_length> - <bounce_count>3</bounce_count> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> </row> <row> <label>2h</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 82db9aa059..776dffd8ef 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -2,11 +2,11 @@ <result> <row> <label>0h</label> - <nb_visits>11</nb_visits> + <nb_visits>12</nb_visits> <nb_actions>16</nb_actions> <max_actions>3</max_actions> - <sum_visit_length>132</sum_visit_length> - <bounce_count>7</bounce_count> + <sum_visit_length>125</sum_visit_length> + <bounce_count>9</bounce_count> <nb_visits_converted>0</nb_visits_converted> <goals> <row idgoal='1'> @@ -17,7 +17,7 @@ </goals> <nb_conversions>11</nb_conversions> <revenue>55</revenue> - <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors> </row> <row> <label>1h</label> 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 9ea269a0ca..13e2d0cb19 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -34,7 +34,7 @@ </row> <row> <label>7 days</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> </row> <row> <label>8-14 days</label> 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 2220417182..acd84cb1e7 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,8 +2,8 @@ <result> <row> <label>1 visit</label> - <nb_visits>34</nb_visits> - <nb_visits_percentage>89%</nb_visits_percentage> + <nb_visits>35</nb_visits> + <nb_visits_percentage>90%</nb_visits_percentage> </row> <row> <label>2 visits</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index 92f5b1c1df..174a8d90d0 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,11 +2,11 @@ <result> <row> <label>1 page</label> - <nb_visits>32</nb_visits> + <nb_visits>34</nb_visits> </row> <row> <label>2 pages</label> - <nb_visits>4</nb_visits> + <nb_visits>3</nb_visits> </row> <row> <label>3 pages</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index eec83a5740..9154335b0c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -2,7 +2,7 @@ <result> <row> <label>0-10s</label> - <nb_visits>34</nb_visits> + <nb_visits>35</nb_visits> </row> <row> <label>11-30s</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml index a946f8e505..5c61a82137 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>32</result>
\ No newline at end of file +<result>34</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml index 579e602751..c3b0e95397 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>7 min 17s</result>
\ No newline at end of file +<result>7 min 10s</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml index 3dc1a7bf03..041729400f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>437</result>
\ No newline at end of file +<result>430</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index 962fbe983a..f24432d1a4 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>38</result>
\ No newline at end of file +<result>39</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml index 0659ce2473..4b7eff0820 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <nb_uniq_visitors>38</nb_uniq_visitors> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> <nb_actions>46</nb_actions> <nb_visits_converted>36</nb_visits_converted> - <bounce_count>32</bounce_count> - <sum_visit_length>437</sum_visit_length> + <bounce_count>34</bounce_count> + <sum_visit_length>430</sum_visit_length> <max_actions>3</max_actions> - <bounce_rate>84%</bounce_rate> + <bounce_rate>87%</bounce_rate> <nb_actions_per_visit>1.2</nb_actions_per_visit> - <avg_time_on_site>12</avg_time_on_site> + <avg_time_on_site>11</avg_time_on_site> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index e28896e01a..40b7ad8851 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -3,7 +3,7 @@ <result date="2012-08"> <row> <label>Piwik test</label> - <nb_visits>38</nb_visits> + <nb_visits>39</nb_visits> <nb_actions>46</nb_actions> <nb_pageviews>40</nb_pageviews> <revenue>180</revenue> diff --git a/tests/resources/access-logs/fake_logs_replay.log b/tests/resources/access-logs/fake_logs_replay.log index 791aba1601..f9ead404ed 100644 --- a/tests/resources/access-logs/fake_logs_replay.log +++ b/tests/resources/access-logs/fake_logs_replay.log @@ -8,6 +8,7 @@ 175.41.192.40 - - [15/Aug/2012:09:01:38 +0200] "GET /piwik.php?idsite=1 HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) " #idsite=1 replay logs from demo (IP were changed) +84.194.72.21 - - [17/Aug/2012:01:34:15 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=045456&h=1&m=34&s=18&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&_id=e01d58157d66e023&_idts=1394670858&_idvc=1&_idn=1&_refts=1394670858&_viewts=1394670858&_ref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=58 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" 93.80.130.163 - - [18/Aug/2012:01:32:23 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=293471&h=4&m=28&s=18&url=http%3A%2F%2Fpiwik.org%2F&urlref=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&_id=f077de87fa56021e&_idts=1394670499&_idvc=1&_idn=1&_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=182 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.2; rv:27.0) Gecko/20100101 Firefox/27.0" 176.41.226.154 - - [18/Aug/2012:01:32:24 +0100] "GET /piwik.php?action_name=Installing%20Piwik%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=144006&h=2&m=32&s=21&url=http%3A%2F%2Fpiwik.org%2Fdocs%2Finstallation%2F&_id=8b11942ef3b17467&_idts=1392074017&_idvc=5&_idn=0&_refts=1394670293&_viewts=1393965698&_ref=https%3A%2F%2Fwww.google.com.tr%2F&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1366x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=134 HTTP/1.1" 200 43 "http://piwik.org/docs/installation/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" 93.80.130.163 - - [18/Aug/2012:01:32:25 +0100] "GET /piwik.php?action_name=Download%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=147473&h=4&m=28&s=20&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" @@ -17,8 +18,7 @@ 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" -84.194.72.21 - - [18/Aug/2012:01:34:15 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=045456&h=1&m=34&s=18&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&_id=e01d58157d66e023&_idts=1394670858&_idvc=1&_idn=1&_refts=1394670858&_viewts=1394670858&_ref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=58 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 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=1344646861&_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" 84.194.72.21 - - [18/Aug/2012:01:34:21 +0100] "GET /piwik.php?link=http%3A%2F%2Fdemo.piwik.org%2F&idsite=1&rec=1&r=578077&h=1&m=34&s=24&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&_id=e01d58157d66e023&_idts=1394670858&_idvc=1&_idn=0&_refts=1394670858&_viewts=1394670858&_ref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=58 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" 50.244.17.130 - - [18/Aug/2012:01:34:31 +0100] "GET /piwik.php?action_name=What%20is%20Piwik%3F%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=388822&h=19&m=34&s=33&url=http%3A%2F%2Fpiwik.org%2Fwhat-is-piwik%2F&urlref=http%3A%2F%2Fpiwik.org%2F&_id=90d89274a8c26d90&_idts=1394670841&_idvc=1&_idn=0&_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/what-is-piwik/" "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" 193.159.20.129 - - [18/Aug/2012:01:34:42 +0100] "GET /piwik.php?action_name=demo.piwik.org%2FPiwik%20Forums%20-%20Piwik%20%E2%80%BA%20Web%20Analytics%20Reports&idsite=1&rec=1&r=546849&h=1&m=34&s=37&url=http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7%23%2Fmodule%3DLive%26action%3DindexVisitorLog%26date%3Dyesterday%26period%3Dday%26idSite%3D7&urlref=http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DMultiSites%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D32&_id=d80e3396f1a4c2ac&_idts=1394665308&_idvc=1&_idn=0&_refts=0&_viewts=1394665308&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1200&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%2C%222%22%3A%5B%22Demo%20language%22%2C%22English%22%5D%7D>_ms=413 HTTP/1.1" 200 43 "http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.45 Safari/537.36" |