Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-06-02 00:46:42 +0300
committerGitHub <noreply@github.com>2017-06-02 00:46:42 +0300
commit457d630c4fc33f6606a500ac439f688fc1508b2a (patch)
tree40b098944a2213ee424b9bd1b51b0d52af2ce816 /plugins/Live/tests/System
parent1821691bb1e333bed804cf7c83a363a74cb9f52a (diff)
Improve handling of DevicePlugins to make it extendable (#11748)
* Improve handling of DevicePlugins to make it extendable * update test files * add some comments to explain automatic plugin column detection * submodule update
Diffstat (limited to 'plugins/Live/tests/System')
-rw-r--r--plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml60
-rw-r--r--plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml120
2 files changed, 150 insertions, 30 deletions
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
index 95e3605e4c..75a12099fb 100644
--- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml
@@ -143,9 +143,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -251,9 +255,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -359,9 +367,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -467,9 +479,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -575,9 +591,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -683,9 +703,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -791,9 +815,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -899,9 +927,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1007,9 +1039,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1115,9 +1151,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
index 42517f659c..2a194415dc 100644
--- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
+++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml
@@ -143,9 +143,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -251,9 +255,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -359,9 +367,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -467,9 +479,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -575,9 +591,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -683,9 +703,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -791,9 +815,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -899,9 +927,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1007,9 +1039,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1115,9 +1151,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1223,9 +1263,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1331,9 +1375,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1439,9 +1487,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1547,9 +1599,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1655,9 +1711,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1763,9 +1823,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1871,9 +1935,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -1979,9 +2047,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -2087,9 +2159,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>
@@ -2195,9 +2271,13 @@
<customVariables>
</customVariables>
<resolution>1024x768</resolution>
- <plugins>flash, java</plugins>
+ <plugins>cookie, flash, java</plugins>
<pluginsIcons>
<row>
+ <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon>
+ <pluginName>cookie</pluginName>
+ </row>
+ <row>
<pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon>
<pluginName>flash</pluginName>
</row>