refs #5940 put tests in correct folders, better testsuite names, some tests still fail and I cannot figure out why

1 files changed, 241 insertions, 0 deletions

diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
new file mode 100644
index 0000000000..0fb183d46f
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2012-08">
+		<row>
+			<label>Piwik test</label>
+			<nb_visits>27</nb_visits>
+			<nb_actions>30</nb_actions>
+			<nb_pageviews>26</nb_pageviews>
+			<revenue>125</revenue>
+			<nb_conversions>25</nb_conversions>
+			<visits_evolution>100%</visits_evolution>
+			<actions_evolution>100%</actions_evolution>
+			<pageviews_evolution>100%</pageviews_evolution>
+			<revenue_evolution>100%</revenue_evolution>
+			<nb_conversions_evolution>100%</nb_conversions_evolution>
+			<group />
+			<main_url>http://piwik.net</main_url>
+			<idsite>1</idsite>
+		</row>
+		<row>
+			<label>Piwik test two</label>
+			<nb_visits>1</nb_visits>
+			<nb_actions>1</nb_actions>
+			<nb_pageviews>1</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<visits_evolution>100%</visits_evolution>
+			<actions_evolution>100%</actions_evolution>
+			<pageviews_evolution>100%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://example-site-two.com</main_url>
+			<idsite>2</idsite>
+		</row>
+	</result>
+	<result date="2012-09">
+		<row>
+			<label>Piwik test</label>
+			<nb_visits>1</nb_visits>
+			<nb_actions>10</nb_actions>
+			<nb_pageviews>10</nb_pageviews>
+			<revenue>5</revenue>
+			<nb_conversions>1</nb_conversions>
+			<visits_evolution>-96.3%</visits_evolution>
+			<actions_evolution>-66.7%</actions_evolution>
+			<pageviews_evolution>-61.5%</pageviews_evolution>
+			<revenue_evolution>-96%</revenue_evolution>
+			<nb_conversions_evolution>-96%</nb_conversions_evolution>
+			<group />
+			<main_url>http://piwik.net</main_url>
+			<idsite>1</idsite>
+		</row>
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test two</label>
+			<visits_evolution>-100%</visits_evolution>
+			<actions_evolution>-100%</actions_evolution>
+			<pageviews_evolution>-100%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://example-site-two.com</main_url>
+			<idsite>2</idsite>
+		</row>
+	</result>
+	<result date="2012-10">
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test</label>
+			<visits_evolution>-100%</visits_evolution>
+			<actions_evolution>-100%</actions_evolution>
+			<pageviews_evolution>-100%</pageviews_evolution>
+			<revenue_evolution>-100%</revenue_evolution>
+			<nb_conversions_evolution>-100%</nb_conversions_evolution>
+			<group />
+			<main_url>http://piwik.net</main_url>
+			<idsite>1</idsite>
+		</row>
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test two</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://example-site-two.com</main_url>
+			<idsite>2</idsite>
+		</row>
+	</result>
+	<result date="2012-11">
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://piwik.net</main_url>
+			<idsite>1</idsite>
+		</row>
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test two</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://example-site-two.com</main_url>
+			<idsite>2</idsite>
+		</row>
+	</result>
+	<result date="2012-12">
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://piwik.net</main_url>
+			<idsite>1</idsite>
+		</row>
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test two</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://example-site-two.com</main_url>
+			<idsite>2</idsite>
+		</row>
+	</result>
+	<result date="2013-01">
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://piwik.net</main_url>
+			<idsite>1</idsite>
+		</row>
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test two</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://example-site-two.com</main_url>
+			<idsite>2</idsite>
+		</row>
+	</result>
+	<result date="2013-02">
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://piwik.net</main_url>
+			<idsite>1</idsite>
+		</row>
+		<row>
+			<nb_visits>0</nb_visits>
+			<nb_actions>0</nb_actions>
+			<nb_pageviews>0</nb_pageviews>
+			<revenue>0</revenue>
+			<nb_conversions>0</nb_conversions>
+			<label>Piwik test two</label>
+			<visits_evolution>0%</visits_evolution>
+			<actions_evolution>0%</actions_evolution>
+			<pageviews_evolution>0%</pageviews_evolution>
+			<revenue_evolution>0%</revenue_evolution>
+			<nb_conversions_evolution>0%</nb_conversions_evolution>
+			<group />
+			<main_url>http://example-site-two.com</main_url>
+			<idsite>2</idsite>
+		</row>
+	</result>
+</results>
\ No newline at end of file