diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-06 06:41:13 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-06 06:41:13 +0400 |
| commit | 8aaa1aba44e541ca260de505a3e98996b98c9f37 (patch) | |
| tree | a72fca923e494a0f2e41947c13c73e9177b78bad | |
| parent | 5a1eab97f54b44f57356b4276b9c9df2a8eef51b (diff) | |
refs #5940 splitting plugin tests folder into unit, integration and system for now
128 files changed, 1731 insertions, 74 deletions
diff --git a/plugins/API/tests/RowEvolutionTest.php b/plugins/API/tests/Integration/RowEvolutionTest.php index 21ea9224bd..555921e56e 100644 --- a/plugins/API/tests/RowEvolutionTest.php +++ b/plugins/API/tests/Integration/RowEvolutionTest.php @@ -6,7 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\tests\Integration; + use Piwik\Plugins\API\RowEvolution; use Piwik\Tests\Fixture; diff --git a/plugins/API/tests/RssRendererTest.php b/plugins/API/tests/Integration/RssRendererTest.php index 7187bae1d2..8bc9fb0792 100644 --- a/plugins/API/tests/RssRendererTest.php +++ b/plugins/API/tests/Integration/RssRendererTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\tests\Integration; use Piwik\Access; use Piwik\DataTable; diff --git a/plugins/API/tests/ConsoleRendererTest.php b/plugins/API/tests/Unit/ConsoleRendererTest.php index 26357935ff..bd556809ff 100644 --- a/plugins/API/tests/ConsoleRendererTest.php +++ b/plugins/API/tests/Unit/ConsoleRendererTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\tests\Unit; use Piwik\DataTable; use Piwik\Plugins\API\Renderer\Console; diff --git a/plugins/API/tests/CsvRendererTest.php b/plugins/API/tests/Unit/CsvRendererTest.php index 526d2f3728..76d16ed515 100644 --- a/plugins/API/tests/CsvRendererTest.php +++ b/plugins/API/tests/Unit/CsvRendererTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\test\Unit; use Piwik\DataTable; use Piwik\Plugins\API\Renderer\Csv; diff --git a/plugins/API/tests/HtmlRendererTest.php b/plugins/API/tests/Unit/HtmlRendererTest.php index 4cf4f98c9b..374f33e0b6 100644 --- a/plugins/API/tests/HtmlRendererTest.php +++ b/plugins/API/tests/Unit/HtmlRendererTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\tests\Unit; use Piwik\DataTable; use Piwik\Plugins\API\Renderer\Html; diff --git a/plugins/API/tests/JsonRendererTest.php b/plugins/API/tests/Unit/JsonRendererTest.php index fc1bf5d502..c4fa076483 100644 --- a/plugins/API/tests/JsonRendererTest.php +++ b/plugins/API/tests/Unit/JsonRendererTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\tests\Unit; use Piwik\DataTable; use Piwik\Plugins\API\Renderer\Json; diff --git a/plugins/API/tests/OriginalRendererTest.php b/plugins/API/tests/Unit/OriginalRendererTest.php Binary files differindex 40a3575ec7..bed40d1e29 100644 --- a/plugins/API/tests/OriginalRendererTest.php +++ b/plugins/API/tests/Unit/OriginalRendererTest.php diff --git a/plugins/API/tests/PhpRendererTest.php b/plugins/API/tests/Unit/PhpRendererTest.php index 5234db8df1..77a5efa568 100644 --- a/plugins/API/tests/PhpRendererTest.php +++ b/plugins/API/tests/Unit/PhpRendererTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\tests\Unit; use Piwik\DataTable; use Piwik\Plugins\API\Renderer\Php; diff --git a/plugins/API/tests/XmlRendererTest.php b/plugins/API/tests/Unit/XmlRendererTest.php index 1d222290bd..f3ca71a10d 100644 --- a/plugins/API/tests/XmlRendererTest.php +++ b/plugins/API/tests/Unit/XmlRendererTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\API\tests; +namespace Piwik\Plugins\API\tests\Unit; use Piwik\DataTable; use Piwik\Plugins\API\Renderer\Xml; diff --git a/plugins/Actions/tests/ArchiverTest.php b/plugins/Actions/tests/Unit/ArchiverTest.php index 6458f425fa..a3ba57511a 100644 --- a/plugins/Actions/tests/ArchiverTest.php +++ b/plugins/Actions/tests/Unit/ArchiverTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\PrivacyManager\tests; +namespace Piwik\Plugins\PrivacyManager\tests\Unit; use Piwik\Plugins\Actions\ArchivingHelper; use Piwik\Tracker\Action; diff --git a/plugins/Contents/.gitignore b/plugins/Contents/.gitignore index b141f4501f..c8c9480010 100644 --- a/plugins/Contents/.gitignore +++ b/plugins/Contents/.gitignore @@ -1 +1 @@ -tests/processed/*xml
\ No newline at end of file +tests/System/processed/*xml
\ No newline at end of file diff --git a/plugins/Contents/tests/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php index c07f491546..d348133c2b 100644 --- a/plugins/Contents/tests/ContentsTest.php +++ b/plugins/Contents/tests/System/ContentsTest.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\Contents\tests; +namespace Piwik\Plugins\Contents\tests\System; use Piwik\Tests\SystemTestCase; use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents; diff --git a/plugins/Contents/tests/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml index d3e1af1e2e..d3e1af1e2e 100644 --- a/plugins/Contents/tests/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml index 402909f7d5..402909f7d5 100644 --- a/plugins/Contents/tests/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml index fde347f2b5..fde347f2b5 100644 --- a/plugins/Contents/tests/expected/test_Contents__Actions.getPageUrls_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Actions.getPageUrls_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml index 3dc775d40a..3dc775d40a 100644 --- a/plugins/Contents/tests/expected/test_Contents__Actions.getPageUrls_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Actions.get_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml index f51cfaf913..f51cfaf913 100644 --- a/plugins/Contents/tests/expected/test_Contents__Actions.get_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Actions.get_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml index f51cfaf913..f51cfaf913 100644 --- a/plugins/Contents/tests/expected/test_Contents__Actions.get_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.get_month.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml index 957c6fa85a..957c6fa85a 100644 --- a/plugins/Contents/tests/expected/test_Contents__Contents.getContentNames_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml index 44bfdfd54e..44bfdfd54e 100644 --- a/plugins/Contents/tests/expected/test_Contents__Contents.getContentNames_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml index 8927f8a8ec..8927f8a8ec 100644 --- a/plugins/Contents/tests/expected/test_Contents__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml index b604544417..b604544417 100644 --- a/plugins/Contents/tests/expected/test_Contents__Contents.getContentPieces_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 989f816722..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 989f816722..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml index c234bed59e..c234bed59e 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml index c234bed59e..c234bed59e 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml index c234bed59e..c234bed59e 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 989f816722..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml index c234bed59e..c234bed59e 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml index 5212486a1c..5212486a1c 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml index ac1d39a577..ac1d39a577 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml diff --git a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 989f816722..989f816722 100644 --- a/plugins/Contents/tests/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml diff --git a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml index c234bed59e..c234bed59e 100644 --- a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml diff --git a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml index 17b781db1c..17b781db1c 100644 --- a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml diff --git a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml index 7df6e4f0e1..7df6e4f0e1 100644 --- a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml diff --git a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 989f816722..989f816722 100644 --- a/plugins/Contents/tests/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml diff --git a/plugins/Contents/tests/processed/.gitkeep b/plugins/Contents/tests/System/processed/.gitkeep index e69de29bb2..e69de29bb2 100644 --- a/plugins/Contents/tests/processed/.gitkeep +++ b/plugins/Contents/tests/System/processed/.gitkeep diff --git a/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml new file mode 100644 index 0000000000..d3e1af1e2e --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <website>Piwik test</website> + <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate> + <metadata> + <category>Actions</category> + <name>Content Name</name> + <module>Contents</module> + <action>getContentNames</action> + <dimension>Content Name</dimension> + <metrics> + <nb_impressions>Impressions</nb_impressions> + <nb_interactions>Interactions</nb_interactions> + </metrics> + <processedMetrics> + <interaction_rate>Interaction Rate</interaction_rate> + </processedMetrics> + <actionToLoadSubTables>getContentNames</actionToLoadSubTables> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentNames&period=range&date=2010-01-03,2010-01-09</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentNames&period=day&date=2010-01-03,2010-01-09</imageGraphEvolutionUrl> + <uniqueId>Contents_getContentNames</uniqueId> + </metadata> + <columns> + <label>Content Name</label> + <nb_impressions>Impressions</nb_impressions> + <nb_interactions>Interactions</nb_interactions> + <interaction_rate>Interaction Rate</interaction_rate> + </columns> + <reportData> + <result prettyDate="Sunday 3 January 2010"> + <row> + <label>ImageAd</label> + <nb_impressions>8</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>25%</interaction_rate> + </row> + <row> + <label>Text Ad</label> + <nb_impressions>6</nb_impressions> + <nb_interactions>4</nb_interactions> + <interaction_rate>66.67%</interaction_rate> + </row> + <row> + <label>Video Ad</label> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + </row> + </result> + <result prettyDate="Monday 4 January 2010" /> + <result prettyDate="Tuesday 5 January 2010" /> + <result prettyDate="Wednesday 6 January 2010" /> + <result prettyDate="Thursday 7 January 2010" /> + <result prettyDate="Friday 8 January 2010" /> + <result prettyDate="Saturday 9 January 2010" /> + </reportData> + <reportMetadata> + <result prettyDate="Sunday 3 January 2010"> + <row> + <contentTarget>http://www.example.com</contentTarget> + + </row> + <row> + <contentTarget>http://piwik.org/</contentTarget> + + </row> + <row> + <contentTarget /> + + </row> + </result> + <result prettyDate="Monday 4 January 2010" /> + <result prettyDate="Tuesday 5 January 2010" /> + <result prettyDate="Wednesday 6 January 2010" /> + <result prettyDate="Thursday 7 January 2010" /> + <result prettyDate="Friday 8 January 2010" /> + <result prettyDate="Saturday 9 January 2010" /> + </reportMetadata> + <reportTotal> + <nb_visits>16</nb_visits> + <nb_uniq_visitors>16</nb_uniq_visitors> + </reportTotal> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml new file mode 100644 index 0000000000..402909f7d5 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <website>Piwik test</website> + <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate> + <metadata> + <category>Actions</category> + <name>Content Piece</name> + <module>Contents</module> + <action>getContentPieces</action> + <dimension>Content Piece</dimension> + <metrics> + <nb_impressions>Impressions</nb_impressions> + <nb_interactions>Interactions</nb_interactions> + </metrics> + <processedMetrics> + <interaction_rate>Interaction Rate</interaction_rate> + </processedMetrics> + <actionToLoadSubTables>getContentPieces</actionToLoadSubTables> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentPieces&period=range&date=2010-01-03,2010-01-09</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Contents&apiAction=getContentPieces&period=day&date=2010-01-03,2010-01-09</imageGraphEvolutionUrl> + <uniqueId>Contents_getContentPieces</uniqueId> + </metadata> + <columns> + <label>Content Piece</label> + <nb_impressions>Impressions</nb_impressions> + <nb_interactions>Interactions</nb_interactions> + <interaction_rate>Interaction Rate</interaction_rate> + </columns> + <reportData> + <result prettyDate="Sunday 3 January 2010"> + <row> + <label>Click to download Piwik now</label> + <nb_impressions>4</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>50%</interaction_rate> + </row> + <row> + <label>/path/ad.jpg</label> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>100%</interaction_rate> + </row> + <row> + <label>/path/ad2.jpg</label> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + </row> + <row> + <label>Click NOW</label> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>100%</interaction_rate> + </row> + <row> + <label>movie.mov</label> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + </row> + <row> + <label>Content Piece not defined</label> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + </row> + <row> + <label>Unknown</label> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + </row> + </result> + <result prettyDate="Monday 4 January 2010" /> + <result prettyDate="Tuesday 5 January 2010" /> + <result prettyDate="Wednesday 6 January 2010" /> + <result prettyDate="Thursday 7 January 2010" /> + <result prettyDate="Friday 8 January 2010" /> + <result prettyDate="Saturday 9 January 2010" /> + </reportData> + <reportMetadata> + <result prettyDate="Sunday 3 January 2010"> + <row> + <contentTarget>http://piwik.org/download</contentTarget> + + </row> + <row> + <contentTarget>http://www.example.com</contentTarget> + + </row> + <row> + <contentTarget>http://www.example.com</contentTarget> + + </row> + <row> + <contentTarget>http://piwik.org/</contentTarget> + + </row> + <row> + <contentTarget /> + + </row> + <row> + <contentTarget /> + + </row> + <row> + <contentTarget /> + + </row> + </result> + <result prettyDate="Monday 4 January 2010" /> + <result prettyDate="Tuesday 5 January 2010" /> + <result prettyDate="Wednesday 6 January 2010" /> + <result prettyDate="Thursday 7 January 2010" /> + <result prettyDate="Friday 8 January 2010" /> + <result prettyDate="Saturday 9 January 2010" /> + </reportMetadata> + <reportTotal> + <nb_visits>16</nb_visits> + <nb_uniq_visitors>16</nb_uniq_visitors> + </reportTotal> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_day.xml new file mode 100644 index 0000000000..fde347f2b5 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_day.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>/page</label> + <nb_visits>2</nb_visits> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_hits>2</nb_hits> + <sum_time_spent>540</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.333</min_time_generation> + <max_time_generation>0.333</max_time_generation> + <entry_nb_uniq_visitors>2</entry_nb_uniq_visitors> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>542</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_uniq_visitors>2</exit_nb_uniq_visitors> + <exit_nb_visits>2</exit_nb_visits> + <avg_time_on_page>270</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.333</avg_time_generation> + <url>http://www.example.org/page</url> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_month.xml new file mode 100644 index 0000000000..3dc775d40a --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Actions.getPageUrls_month.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>/page</label> + <nb_visits>2</nb_visits> + <nb_hits>2</nb_hits> + <sum_time_spent>540</sum_time_spent> + <nb_hits_with_time_generation>2</nb_hits_with_time_generation> + <min_time_generation>0.333</min_time_generation> + <max_time_generation>0.333</max_time_generation> + <entry_nb_visits>2</entry_nb_visits> + <entry_nb_actions>2</entry_nb_actions> + <entry_sum_visit_length>542</entry_sum_visit_length> + <entry_bounce_count>2</entry_bounce_count> + <exit_nb_visits>2</exit_nb_visits> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors> + <sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors> + <avg_time_on_page>270</avg_time_on_page> + <bounce_rate>100%</bounce_rate> + <exit_rate>100%</exit_rate> + <avg_time_generation>0.333</avg_time_generation> + <url>http://www.example.org/page</url> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.get_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.get_day.xml new file mode 100644 index 0000000000..f51cfaf913 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Actions.get_day.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> + <nb_searches>0</nb_searches> + <nb_keywords>0</nb_keywords> + <avg_time_generation>0.335</avg_time_generation> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Actions.get_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Actions.get_month.xml new file mode 100644 index 0000000000..f51cfaf913 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Actions.get_month.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_pageviews>2</nb_pageviews> + <nb_uniq_pageviews>2</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> + <nb_searches>0</nb_searches> + <nb_keywords>0</nb_keywords> + <avg_time_generation>0.335</avg_time_generation> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_day.xml new file mode 100644 index 0000000000..957c6fa85a --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_day.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>ImageAd</label> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>8</nb_visits> + <nb_impressions>8</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>25%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>Text Ad</label> + <nb_uniq_visitors>6</nb_uniq_visitors> + <nb_visits>6</nb_visits> + <nb_impressions>6</nb_impressions> + <nb_interactions>4</nb_interactions> + <interaction_rate>66.67%</interaction_rate> + <contentTarget>http://piwik.org/</contentTarget> + </row> + <row> + <label>Video Ad</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_month.xml new file mode 100644 index 0000000000..44bfdfd54e --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentNames_month.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>ImageAd</label> + <nb_visits>8</nb_visits> + <nb_impressions>8</nb_impressions> + <nb_interactions>2</nb_interactions> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <interaction_rate>25%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>Text Ad</label> + <nb_visits>6</nb_visits> + <nb_impressions>6</nb_impressions> + <nb_interactions>4</nb_interactions> + <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <interaction_rate>66.67%</interaction_rate> + <contentTarget>http://piwik.org/</contentTarget> + </row> + <row> + <label>Video Ad</label> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_day.xml new file mode 100644 index 0000000000..8927f8a8ec --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_day.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Click to download Piwik now</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_impressions>4</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>50%</interaction_rate> + <contentTarget>http://piwik.org/download</contentTarget> + </row> + <row> + <label>/path/ad.jpg</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>/path/ad2.jpg</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>Click NOW</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget>http://piwik.org/</contentTarget> + </row> + <row> + <label>movie.mov</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> + <row> + <label>Content Piece not defined</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> + <row> + <label>Unknown</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_month.xml new file mode 100644 index 0000000000..b604544417 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Contents.getContentPieces_month.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Click to download Piwik now</label> + <nb_visits>4</nb_visits> + <nb_impressions>4</nb_impressions> + <nb_interactions>2</nb_interactions> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <interaction_rate>50%</interaction_rate> + <contentTarget>http://piwik.org/download</contentTarget> + </row> + <row> + <label>/path/ad.jpg</label> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <interaction_rate>100%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>/path/ad2.jpg</label> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <interaction_rate>0%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>Click NOW</label> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <interaction_rate>100%</interaction_rate> + <contentTarget>http://piwik.org/</contentTarget> + </row> + <row> + <label>movie.mov</label> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> + <row> + <label>Content Piece not defined</label> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> + <row> + <label>Unknown</label> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..989f816722 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>1</idVisit> + <visitIp>156.5.3.2</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>1</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>111.1.1.1</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>13</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_month.xml new file mode 100644 index 0000000000..989f816722 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents__Live.getLastVisitsDetails_month.xml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>1</idVisit> + <visitIp>156.5.3.2</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>1</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>111.1.1.1</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>13</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml new file mode 100644 index 0000000000..c234bed59e --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Actions.getPageUrls_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml new file mode 100644 index 0000000000..c234bed59e --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentNames_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml new file mode 100644 index 0000000000..c234bed59e --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Contents.getContentPieces_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..989f816722 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>1</idVisit> + <visitIp>156.5.3.2</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>1</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>111.1.1.1</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>13</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml new file mode 100644 index 0000000000..c234bed59e --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Actions.getPageUrls_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml new file mode 100644 index 0000000000..5212486a1c --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>ImageAd</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_impressions>4</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>50%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml new file mode 100644 index 0000000000..ac1d39a577 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>/path/ad.jpg</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>/path/ad2.jpg</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..989f816722 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>1</idVisit> + <visitIp>156.5.3.2</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>1</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>111.1.1.1</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>13</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml new file mode 100644 index 0000000000..c234bed59e --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Actions.getPageUrls_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml new file mode 100644 index 0000000000..17b781db1c --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>ImageAd</label> + <nb_uniq_visitors>8</nb_uniq_visitors> + <nb_visits>8</nb_visits> + <nb_impressions>8</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>25%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>Text Ad</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_impressions>4</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>50%</interaction_rate> + <contentTarget>http://piwik.org/download</contentTarget> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml new file mode 100644 index 0000000000..7df6e4f0e1 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Click to download Piwik now</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_impressions>4</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>50%</interaction_rate> + <contentTarget>http://piwik.org/download</contentTarget> + </row> + <row> + <label>/path/ad.jpg</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>2</nb_interactions> + <interaction_rate>100%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>/path/ad2.jpg</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget>http://www.example.com</contentTarget> + </row> + <row> + <label>Content Piece not defined</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> + <row> + <label>Unknown</label> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_impressions>2</nb_impressions> + <nb_interactions>0</nb_interactions> + <interaction_rate>0%</interaction_rate> + <contentTarget /> + </row> +</result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml new file mode 100644 index 0000000000..989f816722 --- /dev/null +++ b/plugins/Contents/tests/System/processed/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <idSite>1</idSite> + <idVisit>1</idVisit> + <visitIp>156.5.3.2</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>1</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>flash, java</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginName>flash</pluginName> + </row> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginName>java</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> + <row> + <idSite>1</idSite> + <idVisit>2</idVisit> + <visitIp>111.1.1.1</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.example.org/page</url> + <pageTitle>Ads</pageTitle> + <pageIdAction>2</pageIdAction> + + <pageId>13</pageId> + <generationTime>0.33s</generationTime> + <timeSpent>0</timeSpent> + <timeSpentPretty>0s</timeSpentPretty> + <icon /> + </row> + </actionDetails> + <goalConversions>0</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <searches>0</searches> + <actions>1</actions> + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> + <visitCount>1</visitCount> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>271</visitDuration> + <visitDurationPretty>4 min 31s</visitDurationPretty> + <customVariables> + </customVariables> + <deviceType>Desktop</deviceType> + <events>0</events> + <provider>Unknown</provider> + <providerName>Unknown</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <operatingSystem>Windows XP</operatingSystem> + <operatingSystemCode>WXP</operatingSystemCode> + <operatingSystemShortName>Win XP</operatingSystemShortName> + <operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> + <browserFamily>gecko</browserFamily> + <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> + <browserName>Firefox 3.6</browserName> + <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> + <browserCode>FF</browserCode> + <browserVersion>3.6</browserVersion> + <screenType>normal</screenType> + <resolution>1024x768</resolution> + <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> + <plugins>director</plugins> + <pluginsIcons> + <row> + <pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon> + <pluginName>director</pluginName> + </row> + </pluginsIcons> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + + + + + + </row> +</result>
\ No newline at end of file diff --git a/plugins/CoreConsole/Commands/GenerateTest.php b/plugins/CoreConsole/Commands/GenerateTest.php index 5b80e389a6..6047f2ddc7 100644 --- a/plugins/CoreConsole/Commands/GenerateTest.php +++ b/plugins/CoreConsole/Commands/GenerateTest.php @@ -37,15 +37,9 @@ class GenerateTest extends GeneratePluginBase $replace = array( 'ExamplePlugin' => $pluginName, 'SimpleTest' => $testName, - 'SimpleSystemTest' => $testName, - '@group Plugins' => '@group ' . $testType + 'SimpleSystemTest' => $testName ); - $testClass = $this->getTestClass($testType); - if (!empty($testClass)) { - $replace['\PHPUnit_Framework_TestCase'] = $testClass; - } - $whitelistFiles = $this->getTestFilesWhitelist($testType); $this->copyTemplateToPlugin($exampleFolder, $pluginName, $replace, $whitelistFiles); @@ -112,23 +106,6 @@ class GenerateTest extends GeneratePluginBase return $this->askPluginNameAndValidate($input, $output, $pluginNames, $invalidName); } - /** - * @param $testType - * @return string - */ - private function getTestClass($testType) - { - if ('Integration' == $testType) { - return '\IntegrationTestCase'; - } - - if ('Unit' == $testType) { - return '\PHPUnit_Framework_TestCase'; - } - - return ''; - } - public function getValidTypes() { return array('unit', 'integration', 'system'); @@ -172,20 +149,31 @@ class GenerateTest extends GeneratePluginBase return array( '/.gitignore', '/tests', - '/tests/SimpleSystemTest.php', - '/tests/expected', - '/tests/expected/test___API.get_day.xml', - '/tests/expected/test___Goals.getItemsSku_day.xml', - '/tests/processed', - '/tests/processed/.gitignore', - '/tests/fixtures', - '/tests/fixtures/SimpleFixtureTrackFewVisits.php' + '/tests/System', + '/tests/System/SimpleSystemTest.php', + '/tests/System/expected', + '/tests/System/expected/test___API.get_day.xml', + '/tests/System/expected/test___Goals.getItemsSku_day.xml', + '/tests/System/processed', + '/tests/System/processed/.gitignore', + '/tests/Fixtures', + '/tests/Fixtures/SimpleFixtureTrackFewVisits.php' + ); + } + + if ('Integration' == $testType) { + + return array( + '/tests', + '/tests/Integration', + '/tests/Integration/SimpleTest.php' ); } return array( '/tests', - '/tests/SimpleTest.php' + '/tests/Unit', + '/tests/Unit/SimpleTest.php' ); } } diff --git a/plugins/CoreConsole/TravisYmlView.php b/plugins/CoreConsole/TravisYmlView.php index 9190f220ad..a89b5f1df5 100644 --- a/plugins/CoreConsole/TravisYmlView.php +++ b/plugins/CoreConsole/TravisYmlView.php @@ -199,16 +199,16 @@ class TravisYmlView extends View $testsToExclude = array(); if ($this->isTargetPluginContainsPluginTests()) { - $testsToRun[] = array('name' => 'IntegrationTests', + $testsToRun[] = array('name' => 'PluginTests', 'vars' => "MYSQL_ADAPTER=PDO_MYSQL"); - $testsToRun[] = array('name' => 'IntegrationTests', + $testsToRun[] = array('name' => 'PluginTests', 'vars' => "MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable"); $testsToExclude[] = array('description' => 'execute latest stable tests only w/ PHP 5.5', 'php' => '5.3.3', - 'env' => 'TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable'); + 'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable'); $testsToExclude[] = array('php' => '5.4', - 'env' => 'TEST_SUITE=IntegrationTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable'); + 'env' => 'TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=latest_stable'); } if ($this->isTargetPluginContainsUITests()) { diff --git a/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php b/plugins/CoreConsole/tests/Integration/TravisYmlViewTest.php index b35819c7f0..f20e1c6d0f 100644 --- a/plugins/CoreConsole/tests/Unit/TravisYmlViewTest.php +++ b/plugins/CoreConsole/tests/Integration/TravisYmlViewTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\CoreConsole\tests\Unit; +namespace Piwik\Plugins\CoreConsole\tests\Integration; use Symfony\Component\Console\Output\ConsoleOutput; use Piwik\Plugins\CoreConsole\TravisYmlView; @@ -61,7 +61,7 @@ class TravisYmlViewTest extends PHPUnit_Framework_TestCase $view->setPlugin('ExamplePlugin'); $view->setExtraGlobalEnvVars(array('secure: artifactspass', 'secure: githubtoken')); $view->setGenerateYmlCommand('./console generate:travis-yml arg1 arg2'); - $view->processExistingTravisYml(PIWIK_INCLUDE_PATH . '/plugins/CoreConsole/tests/resources/test.travis.yml'); + $view->processExistingTravisYml(PIWIK_INCLUDE_PATH . '/plugins/CoreConsole/tests/Integration/resources/test.travis.yml'); $output = $view->render(); $yaml = Spyc::YAMLLoadString($output); diff --git a/plugins/CoreConsole/tests/resources/test.travis.yml b/plugins/CoreConsole/tests/Integration/resources/test.travis.yml index 3d469b75ff..3d469b75ff 100644 --- a/plugins/CoreConsole/tests/resources/test.travis.yml +++ b/plugins/CoreConsole/tests/Integration/resources/test.travis.yml diff --git a/plugins/CorePluginsAdmin/tests/UpdateCommunicationTest.php b/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php index 8da5e00928..c57a3e0058 100644 --- a/plugins/CorePluginsAdmin/tests/UpdateCommunicationTest.php +++ b/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\CorePluginsAdmin\tests; +namespace Piwik\Plugins\CorePluginsAdmin\tests\Integration; use Piwik\Config; use Piwik\Option; diff --git a/plugins/CoreUpdater/tests/UpdateCommunicationTest.php b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php index d4ee8932c9..d4ee8932c9 100644 --- a/plugins/CoreUpdater/tests/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php diff --git a/plugins/CoreUpdater/tests/ModelTest.php b/plugins/CoreUpdater/tests/Unit/ModelTest.php index 3098595b77..3098595b77 100644 --- a/plugins/CoreUpdater/tests/ModelTest.php +++ b/plugins/CoreUpdater/tests/Unit/ModelTest.php diff --git a/plugins/CustomVariables/.gitignore b/plugins/CustomVariables/.gitignore new file mode 100644 index 0000000000..c8c9480010 --- /dev/null +++ b/plugins/CustomVariables/.gitignore @@ -0,0 +1 @@ +tests/System/processed/*xml
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/CustomVariablesTest.php b/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php index 25a158589e..25a158589e 100644 --- a/plugins/CustomVariables/tests/CustomVariablesTest.php +++ b/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php diff --git a/plugins/CustomVariables/tests/ModelTest.php b/plugins/CustomVariables/tests/Integration/ModelTest.php index db0afbbba9..11d444b748 100644 --- a/plugins/CustomVariables/tests/ModelTest.php +++ b/plugins/CustomVariables/tests/Integration/ModelTest.php @@ -7,9 +7,7 @@ */ namespace Piwik\Plugins\CustomVariables\tests; -use Piwik\Common; use Piwik\Db; -use Piwik\DbHelper; use Piwik\Plugins\CustomVariables\Model; /** diff --git a/plugins/CustomVariables/tests/CustomVariablesSystemTest.php b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php index 1bcdf9f838..1bcdf9f838 100644 --- a/plugins/CustomVariables/tests/CustomVariablesSystemTest.php +++ b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php diff --git a/plugins/CustomVariables/tests/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml index 1ecaf61b08..1ecaf61b08 100644 --- a/plugins/CustomVariables/tests/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml diff --git a/plugins/CustomVariables/tests/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index a61cb11554..a61cb11554 100644 --- a/plugins/CustomVariables/tests/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml index 1ecaf61b08..1ecaf61b08 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml +++ b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__CustomVariables.getCustomVariables_day.xml diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml index a61cb11554..a61cb11554 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml index 1ecaf61b08..1ecaf61b08 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml +++ b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index a61cb11554..a61cb11554 100644 --- a/plugins/CustomVariables/tests/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/processed/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml diff --git a/plugins/ExamplePlugin/.gitignore b/plugins/ExamplePlugin/.gitignore index b141f4501f..c8c9480010 100644 --- a/plugins/ExamplePlugin/.gitignore +++ b/plugins/ExamplePlugin/.gitignore @@ -1 +1 @@ -tests/processed/*xml
\ No newline at end of file +tests/System/processed/*xml
\ No newline at end of file diff --git a/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php b/plugins/ExamplePlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php index ea9755f6a1..2d455ce70a 100644 --- a/plugins/ExamplePlugin/tests/fixtures/SimpleFixtureTrackFewVisits.php +++ b/plugins/ExamplePlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\ExamplePlugin\tests\fixtures; +namespace Piwik\Plugins\ExamplePlugin\tests\Fixtures; use Piwik\Date; use Piwik\Tests\Fixture; diff --git a/plugins/ExamplePlugin/tests/Integration/SimpleTest.php b/plugins/ExamplePlugin/tests/Integration/SimpleTest.php new file mode 100644 index 0000000000..c096b2946b --- /dev/null +++ b/plugins/ExamplePlugin/tests/Integration/SimpleTest.php @@ -0,0 +1,24 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +namespace Piwik\Plugins\ExamplePlugin\tests\Integration; + +/** + * @group ExamplePlugin + * @group SimpleTest + * @group Plugins + */ +class SimpleTest extends \IntegrationTestCase +{ + + public function testSimpleAddition() + { + $this->assertEquals(2, 1+1); + } + +} diff --git a/plugins/ExamplePlugin/tests/SimpleSystemTest.php b/plugins/ExamplePlugin/tests/System/SimpleSystemTest.php index ec36ab8e31..574e6b5a79 100644 --- a/plugins/ExamplePlugin/tests/SimpleSystemTest.php +++ b/plugins/ExamplePlugin/tests/System/SimpleSystemTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\ExamplePlugin\tests; +namespace Piwik\Plugins\ExamplePlugin\tests\System; use Piwik\Plugins\ExamplePlugin\tests\fixtures\SimpleFixtureTrackFewVisits; use Piwik\Tests\SystemTestCase; diff --git a/plugins/ExamplePlugin/tests/expected/test___API.get_day.xml b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml index 58296797c0..58296797c0 100644 --- a/plugins/ExamplePlugin/tests/expected/test___API.get_day.xml +++ b/plugins/ExamplePlugin/tests/System/expected/test___API.get_day.xml diff --git a/plugins/ExamplePlugin/tests/expected/test___Goals.getItemsSku_day.xml b/plugins/ExamplePlugin/tests/System/expected/test___Goals.getItemsSku_day.xml index ba820ed649..ba820ed649 100644 --- a/plugins/ExamplePlugin/tests/expected/test___Goals.getItemsSku_day.xml +++ b/plugins/ExamplePlugin/tests/System/expected/test___Goals.getItemsSku_day.xml diff --git a/plugins/ExamplePlugin/tests/processed/.gitkeep b/plugins/ExamplePlugin/tests/System/processed/.gitkeep index e69de29bb2..e69de29bb2 100644 --- a/plugins/ExamplePlugin/tests/processed/.gitkeep +++ b/plugins/ExamplePlugin/tests/System/processed/.gitkeep diff --git a/plugins/ExamplePlugin/tests/System/processed/test___API.get_day.xml b/plugins/ExamplePlugin/tests/System/processed/test___API.get_day.xml new file mode 100644 index 0000000000..1cfef75f4b --- /dev/null +++ b/plugins/ExamplePlugin/tests/System/processed/test___API.get_day.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <nb_uniq_visitors>2</nb_uniq_visitors> + <nb_visits>2</nb_visits> + <nb_users>0</nb_users> + <nb_actions>4</nb_actions> + <max_actions>2</max_actions> + <bounce_rate>0%</bounce_rate> + <nb_actions_per_visit>2</nb_actions_per_visit> + <avg_time_on_site>632</avg_time_on_site> + <nb_visits_returning>0</nb_visits_returning> + <nb_actions_returning>0</nb_actions_returning> + <nb_uniq_visitors_returning>0</nb_uniq_visitors_returning> + <bounce_rate_returning>0%</bounce_rate_returning> + <nb_actions_per_visit_returning>0</nb_actions_per_visit_returning> + <avg_time_on_site_returning>0</avg_time_on_site_returning> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <conversion_rate>50</conversion_rate> + <revenue>2541</revenue> + <nb_pageviews>3</nb_pageviews> + <nb_uniq_pageviews>3</nb_uniq_pageviews> + <nb_downloads>0</nb_downloads> + <nb_uniq_downloads>0</nb_uniq_downloads> + <nb_outlinks>0</nb_outlinks> + <nb_uniq_outlinks>0</nb_uniq_outlinks> + <nb_searches>1</nb_searches> + <nb_keywords>1</nb_keywords> + <avg_time_generation>0</avg_time_generation> +</result>
\ No newline at end of file diff --git a/plugins/ExamplePlugin/tests/System/processed/test___Goals.getItemsSku_day.xml b/plugins/ExamplePlugin/tests/System/processed/test___Goals.getItemsSku_day.xml new file mode 100644 index 0000000000..ba820ed649 --- /dev/null +++ b/plugins/ExamplePlugin/tests/System/processed/test___Goals.getItemsSku_day.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>SKU_ID</label> + <revenue>25641</revenue> + <quantity>33</quantity> + <orders>1</orders> + <avg_price>777</avg_price> + <avg_quantity>33</avg_quantity> + <conversion_rate>0%</conversion_rate> + </row> +</result>
\ No newline at end of file diff --git a/plugins/ExamplePlugin/tests/SimpleTest.php b/plugins/ExamplePlugin/tests/Unit/SimpleTest.php index 0fdc86062c..396ee20785 100644 --- a/plugins/ExamplePlugin/tests/SimpleTest.php +++ b/plugins/ExamplePlugin/tests/Unit/SimpleTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\ExamplePlugin\tests; +namespace Piwik\Plugins\ExamplePlugin\tests\Unit; /** * @group ExamplePlugin diff --git a/plugins/Goals/tests/APITest.php b/plugins/Goals/tests/Integration/APITest.php index 39672b722d..6251628430 100644 --- a/plugins/Goals/tests/APITest.php +++ b/plugins/Goals/tests/Integration/APITest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\Goals\tests; +namespace Piwik\Plugins\Goals\tests\Integration; use Piwik\Access; use Piwik\Piwik; use Piwik\Plugins\Goals\API; diff --git a/plugins/Insights/tests/ApiTest.php b/plugins/Insights/tests/Integration/ApiTest.php index 356bc769de..356bc769de 100644 --- a/plugins/Insights/tests/ApiTest.php +++ b/plugins/Insights/tests/Integration/ApiTest.php diff --git a/plugins/Insights/tests/ModelTest.php b/plugins/Insights/tests/Integration/ModelTest.php index 94ff52201d..94ff52201d 100644 --- a/plugins/Insights/tests/ModelTest.php +++ b/plugins/Insights/tests/Integration/ModelTest.php diff --git a/plugins/Insights/tests/BaseUnitTest.php b/plugins/Insights/tests/Unit/BaseUnitTest.php index 97c2c78580..97c2c78580 100644 --- a/plugins/Insights/tests/BaseUnitTest.php +++ b/plugins/Insights/tests/Unit/BaseUnitTest.php diff --git a/plugins/Insights/tests/FilterExcludeLowValueTest.php b/plugins/Insights/tests/Unit/FilterExcludeLowValueTest.php index 51c0192ef6..51c0192ef6 100644 --- a/plugins/Insights/tests/FilterExcludeLowValueTest.php +++ b/plugins/Insights/tests/Unit/FilterExcludeLowValueTest.php diff --git a/plugins/Insights/tests/FilterInsightTest.php b/plugins/Insights/tests/Unit/FilterInsightTest.php index 67c216b192..67c216b192 100644 --- a/plugins/Insights/tests/FilterInsightTest.php +++ b/plugins/Insights/tests/Unit/FilterInsightTest.php diff --git a/plugins/Insights/tests/FilterLimitTest.php b/plugins/Insights/tests/Unit/FilterLimitTest.php index 6f6d703b0a..6f6d703b0a 100644 --- a/plugins/Insights/tests/FilterLimitTest.php +++ b/plugins/Insights/tests/Unit/FilterLimitTest.php diff --git a/plugins/Insights/tests/FilterMinGrowthTest.php b/plugins/Insights/tests/Unit/FilterMinGrowthTest.php index a53245b891..a53245b891 100644 --- a/plugins/Insights/tests/FilterMinGrowthTest.php +++ b/plugins/Insights/tests/Unit/FilterMinGrowthTest.php diff --git a/plugins/Insights/tests/FilterOrderByTest.php b/plugins/Insights/tests/Unit/FilterOrderByTest.php index 8239204a2f..8239204a2f 100644 --- a/plugins/Insights/tests/FilterOrderByTest.php +++ b/plugins/Insights/tests/Unit/FilterOrderByTest.php diff --git a/plugins/Insights/tests/InsightReportTest.php b/plugins/Insights/tests/Unit/InsightReportTest.php index 32901409ac..32901409ac 100644 --- a/plugins/Insights/tests/InsightReportTest.php +++ b/plugins/Insights/tests/Unit/InsightReportTest.php diff --git a/plugins/LanguagesManager/tests/LanguagesManagerTest.php b/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php index 3ed219acf4..3ed219acf4 100755 --- a/plugins/LanguagesManager/tests/LanguagesManagerTest.php +++ b/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php diff --git a/plugins/LeftMenu/tests/APITest.php b/plugins/LeftMenu/tests/Integration/APITest.php index 1b80cdc0d8..0677f57c73 100644 --- a/plugins/LeftMenu/tests/APITest.php +++ b/plugins/LeftMenu/tests/Integration/APITest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\LeftMenu\tests; +namespace Piwik\Plugins\LeftMenu\tests\Integration; use Piwik\Access; use Piwik\Plugins\LeftMenu\API; diff --git a/plugins/Live/tests/APITest.php b/plugins/Live/tests/Integration/APITest.php index 5bdf6f2f22..7c49eb2eae 100644 --- a/plugins/Live/tests/APITest.php +++ b/plugins/Live/tests/Integration/APITest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\Live\tests; +namespace Piwik\Plugins\Live\tests\Integration; use Piwik\Date; use Piwik\Db; diff --git a/plugins/Login/tests/LoginTest.php b/plugins/Login/tests/Integration/LoginTest.php index 8e431c9372..4af87cc115 100644 --- a/plugins/Login/tests/LoginTest.php +++ b/plugins/Login/tests/Integration/LoginTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\Login\tests; +namespace Piwik\Plugins\Login\tests\Integration; use Piwik\Access; use Piwik\AuthResult; diff --git a/plugins/MobileMessaging/tests/MobileMessagingTest.php b/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php index dab19beb83..35479dcea8 100644 --- a/plugins/MobileMessaging/tests/MobileMessagingTest.php +++ b/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\MobileMessaging\tests; +namespace Piwik\Plugins\MobileMessaging\tests\Integration; use Piwik\Access; use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging; diff --git a/plugins/MultiSites/tests/MultiSitesTest.php b/plugins/MultiSites/tests/Integration/MultiSitesTest.php index 9f317d5ca7..5f07c7131c 100644 --- a/plugins/MultiSites/tests/MultiSitesTest.php +++ b/plugins/MultiSites/tests/Integration/MultiSitesTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\MultiSites\tests; +namespace Piwik\Plugins\MultiSites\tests\Integration; use Piwik\Access; use Piwik\Plugins\MultiSites\API as APIMultiSites; diff --git a/plugins/PrivacyManager/tests/PrivacyManagerConfigTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php index 88194e78f1..88194e78f1 100644 --- a/plugins/PrivacyManager/tests/PrivacyManagerConfigTest.php +++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php diff --git a/plugins/PrivacyManager/tests/PrivacyManagerTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php index f9e3b43079..f9e3b43079 100644 --- a/plugins/PrivacyManager/tests/PrivacyManagerTest.php +++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php diff --git a/plugins/PrivacyManager/tests/AnonymizeIPTest.php b/plugins/PrivacyManager/tests/Unit/AnonymizeIPTest.php index 0ed4e6e4ca..0ed4e6e4ca 100644 --- a/plugins/PrivacyManager/tests/AnonymizeIPTest.php +++ b/plugins/PrivacyManager/tests/Unit/AnonymizeIPTest.php diff --git a/plugins/Proxy/tests/ProxyTest.php b/plugins/Proxy/tests/Unit/ProxyTest.php index 8b460a35cc..fa0175d040 100644 --- a/plugins/Proxy/tests/ProxyTest.php +++ b/plugins/Proxy/tests/Unit/ProxyTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\Proxy\tests; +namespace Piwik\Plugins\Proxy\tests\Unit; use Piwik\Plugins\Proxy\Controller; diff --git a/plugins/Referrers/tests/ReferrersTest.php b/plugins/Referrers/tests/Unit/ReferrersTest.php index 909e6bf65e..909e6bf65e 100644 --- a/plugins/Referrers/tests/ReferrersTest.php +++ b/plugins/Referrers/tests/Unit/ReferrersTest.php diff --git a/plugins/SEO/tests/SEOTest.php b/plugins/SEO/tests/Unit/SEOTest.php index 06f627d2b4..71cc2e341d 100644 --- a/plugins/SEO/tests/SEOTest.php +++ b/plugins/SEO/tests/Unit/SEOTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\SEO\tests; +namespace Piwik\Plugins\SEO\tests\Unit; use Piwik\Access; use Piwik\DataTable\Renderer; diff --git a/plugins/ScheduledReports/tests/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php index 7f5f1649e0..7f5f1649e0 100644 --- a/plugins/ScheduledReports/tests/ApiTest.php +++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php diff --git a/plugins/ScheduledReports/tests/ScheduledReportsTest.php b/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php index 241e063aa0..241e063aa0 100644 --- a/plugins/ScheduledReports/tests/ScheduledReportsTest.php +++ b/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php diff --git a/plugins/SegmentEditor/tests/SegmentEditorTest.php b/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php index 16f1b3fe34..3fd322b62f 100644 --- a/plugins/SegmentEditor/tests/SegmentEditorTest.php +++ b/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\SegmentEditor\tests; +namespace Piwik\Plugins\SegmentEditor\tests\Integration; use Piwik\Access; use Piwik\Date; diff --git a/plugins/SitesManager/tests/SiteUrlsTest.php b/plugins/SitesManager/tests/Integration/SiteUrlsTest.php index 588b3c08f2..2ab2711c8d 100644 --- a/plugins/SitesManager/tests/SiteUrlsTest.php +++ b/plugins/SitesManager/tests/Integration/SiteUrlsTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\SitesManager\tests; +namespace Piwik\Plugins\SitesManager\tests\Integration; use Piwik\CacheFile; use Piwik\Plugins\SitesManager\API; use Piwik\Plugins\SitesManager\SiteUrls; diff --git a/plugins/SitesManager/tests/SitesManagerTest.php b/plugins/SitesManager/tests/Integration/SitesManagerTest.php index 6d08f0de20..dc8ab0713c 100644 --- a/plugins/SitesManager/tests/SitesManagerTest.php +++ b/plugins/SitesManager/tests/Integration/SitesManagerTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\SitesManager\tests; +namespace Piwik\Plugins\SitesManager\tests\Integration; use Piwik\Access; use Piwik\Plugins\SitesManager\API; diff --git a/plugins/UserCountry/tests/UserCountryTest.php b/plugins/UserCountry/tests/Unit/UserCountryTest.php index 4dc6b9b497..540be65d70 100644 --- a/plugins/UserCountry/tests/UserCountryTest.php +++ b/plugins/UserCountry/tests/Unit/UserCountryTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\UserCountry\tests; +namespace Piwik\Plugins\UserCountry\tests\Unit; use Piwik\Plugins\UserCountry\GeoIPAutoUpdater; use Piwik\Plugins\UserCountry\LocationProvider\GeoIp; diff --git a/plugins/UserSettings/.gitignore b/plugins/UserSettings/.gitignore new file mode 100644 index 0000000000..c8c9480010 --- /dev/null +++ b/plugins/UserSettings/.gitignore @@ -0,0 +1 @@ +tests/System/processed/*xml
\ No newline at end of file diff --git a/plugins/UserSettings/tests/GetLanguageSystemTest.php b/plugins/UserSettings/tests/System/GetLanguageSystemTest.php index e757becb14..cb87f88d1f 100644 --- a/plugins/UserSettings/tests/GetLanguageSystemTest.php +++ b/plugins/UserSettings/tests/System/GetLanguageSystemTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\tests; +namespace Piwik\Plugins\UserSettings\tests\System; use Piwik\Plugins\UserSettings\tests\Fixtures\LanguageFixture; diff --git a/plugins/UserSettings/tests/expected/test___UserSettings.getLanguageCode_day.xml b/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguageCode_day.xml index 689e3d7d37..689e3d7d37 100644 --- a/plugins/UserSettings/tests/expected/test___UserSettings.getLanguageCode_day.xml +++ b/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguageCode_day.xml diff --git a/plugins/UserSettings/tests/expected/test___UserSettings.getLanguage_day.xml b/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguage_day.xml index 6bb328c660..6bb328c660 100644 --- a/plugins/UserSettings/tests/expected/test___UserSettings.getLanguage_day.xml +++ b/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguage_day.xml diff --git a/plugins/UserSettings/tests/processed/.gitkeep b/plugins/UserSettings/tests/System/processed/.gitkeep index e69de29bb2..e69de29bb2 100644 --- a/plugins/UserSettings/tests/processed/.gitkeep +++ b/plugins/UserSettings/tests/System/processed/.gitkeep diff --git a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml b/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguageCode_day.xml index 689e3d7d37..689e3d7d37 100644 --- a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguageCode_day.xml +++ b/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguageCode_day.xml diff --git a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml b/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguage_day.xml index 6bb328c660..6bb328c660 100644 --- a/plugins/UserSettings/tests/processed/test___UserSettings.getLanguage_day.xml +++ b/plugins/UserSettings/tests/System/processed/test___UserSettings.getLanguage_day.xml diff --git a/plugins/UserSettings/tests/UserSettingsTest.php b/plugins/UserSettings/tests/Unit/UserSettingsTest.php index 95188a15e4..408420ed6f 100644 --- a/plugins/UserSettings/tests/UserSettingsTest.php +++ b/plugins/UserSettings/tests/Unit/UserSettingsTest.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\UserSettings\tests; +namespace Piwik\Plugins\UserSettings\tests\Unit; use UserAgentParser; diff --git a/plugins/UsersManager/tests/APITest.php b/plugins/UsersManager/tests/Integration/APITest.php index 3d77ee7a83..3d77ee7a83 100644 --- a/plugins/UsersManager/tests/APITest.php +++ b/plugins/UsersManager/tests/Integration/APITest.php diff --git a/plugins/UsersManager/tests/UserPreferencesTest.php b/plugins/UsersManager/tests/Integration/UserPreferencesTest.php index 50658e46e2..50658e46e2 100644 --- a/plugins/UsersManager/tests/UserPreferencesTest.php +++ b/plugins/UsersManager/tests/Integration/UserPreferencesTest.php diff --git a/plugins/UsersManager/tests/UsersManagerTest.php b/plugins/UsersManager/tests/Integration/UsersManagerTest.php index da73e142d3..115df6c0bb 100644 --- a/plugins/UsersManager/tests/UsersManagerTest.php +++ b/plugins/UsersManager/tests/Integration/UsersManagerTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -namespace Piwik\Plugins\UsersManager\tests; +namespace Piwik\Plugins\UsersManager\tests\Integration; use Piwik\Access; use Piwik\Plugins\SitesManager\API as APISitesManager; @@ -24,6 +24,8 @@ use Exception; * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * + * @group UsersManagerTest + * @group UsersManager * @group Plugins */ class UsersManagerTest extends IntegrationTestCase diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist index 6aef96407c..082591ec29 100644 --- a/tests/PHPUnit/phpunit.xml.dist +++ b/tests/PHPUnit/phpunit.xml.dist @@ -33,17 +33,38 @@ <testsuites> <testsuite name="SystemTests"> <directory>./System</directory> + <directory>../../plugins/*/tests</directory><!-- There should be actually a tests/System but this way we make sure to execute all tests even if some are not moved to correct subdirectory. We will execute Unit and Integration tests twice :( ... --> + <directory>../../plugins/*/Test</directory> + <exclude>../../plugins/*/tests/Integration</exclude><!-- * in exclude is currently not supported by PHPUnit, so it won't work yet --> + <exclude>../../plugins/*/Test/Integration</exclude> + <exclude>../../plugins/*/tests/Unit</exclude> + <exclude>../../plugins/*/Test/Unit</exclude> + <exclude>../../plugins/*/tests/UI</exclude> + <exclude>../../plugins/*/Test/UI</exclude> </testsuite> <testsuite name="IntegrationTests"> <directory>./Integration</directory> - <directory>../../plugins/*/tests</directory> - <directory>../../plugins/*/Test</directory> + <directory>../../plugins/*/tests/Integration</directory> + <directory>../../plugins/*/Test/Integration</directory> </testsuite> <testsuite name="UnitTests"> <directory>./Unit</directory> + <directory>../../plugins/*/tests/Unit</directory> + <directory>../../plugins/*/Test/Unit</directory> </testsuite> <testsuite name="UITests"> <directory>./UI</directory> + <directory>../../plugins/*/tests/UI</directory> + <directory>../../plugins/*/Test/UI</directory> + </testsuite> + <testsuite name="PluginTests"> + <directory>../../plugins/*/tests</directory> + <directory>../../plugins/*/Test</directory> + </testsuite> + <testsuite name="CoreTests"> + <directory>./Unit</directory> + <directory>./Integration</directory> + <directory>./System</directory> </testsuite> </testsuites> |