From 428bfff8b48a1f0f1919ce6d07fad805f93993d5 Mon Sep 17 00:00:00 2001 From: sgiehl <stefan@piwik.org> Date: Wed, 11 Jun 2014 18:17:03 +0200 Subject: [PATCH] fixing some integration tests --- ...ITest__Live.getLastVisitsDetails_range.xml | 28 +++++++++---------- ...sion__API.getSuggestedValuesForSegment.xml | 1 - 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 8410546408..247d5fbf7a 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -1713,9 +1713,9 @@ <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> + <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1961,9 +1961,9 @@ <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> + <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2263,9 +2263,9 @@ <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> + <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2511,9 +2511,9 @@ <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> + <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2917,9 +2917,9 @@ <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> + <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3427,9 +3427,9 @@ <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> + <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4008,9 +4008,9 @@ <browserName>Unknown</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Desktop</deviceType> + <deviceType>Unknown</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml index 0896346301..abcc43c819 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row>3.6</row> - <row>UNK</row> </result> \ No newline at end of file -- GitLab