cleaned os detections; added at least one test for each os

matomo-org · Aug 28, 2014 · 6681818 · 6681818
1 parent ffd6271
commit 6681818
Show file tree

Hide file tree

Showing 4 changed files with 636 additions and 5 deletions.
diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php
@@ -56,6 +56,7 @@ class OperatingSystem extends ParserAbstract
         'KBT' => 'Kubuntu',
         'LIN' => 'GNU/Linux',
         'LBT' => 'Lubuntu',
+        'VLN' => 'VectorLinux',
         'MAC' => 'Mac',
         'MDR' => 'Mandriva',
         'SMG' => 'MeeGo',
@@ -68,8 +69,6 @@ class OperatingSystem extends ParserAbstract
         'OBS' => 'OpenBSD',
         'PSP' => 'PlayStation Portable',
         'PS3' => 'PlayStation',
-        'PRS' => 'Presto',
-        'PPY' => 'Puppy',
         'RHT' => 'Red Hat',
         'ROS' => 'RISC OS',
         'SAB' => 'Sabayon',
@@ -130,7 +129,7 @@ class OperatingSystem extends ParserAbstract
         'IBM'                   => array('OS2'),
         'iOS'                   => array('IOS'),
         'RISC OS'               => array('ROS'),
-        'GNU/Linux'             => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS', 'SAF'),
+        'GNU/Linux'             => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'VLN', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'CES', 'BTR', 'YNS', 'SAF'),
         'Mac'                   => array('MAC'),
         'Mobile Gaming Console' => array('PSP', 'NDS', 'XBX'),
         'Other Mobile'          => array('WOS', 'POS', 'SBA', 'TIZ', 'SMG'),

diff --git a/Tests/Parser/OperatingSystemTest.php b/Tests/Parser/OperatingSystemTest.php
@@ -12,6 +12,25 @@
 
 class OperatingSystemTest extends \PHPUnit_Framework_TestCase
 {
+    static $osTested = array();
+
+    /**
+     * @dataProvider getFixtures
+     */
+    public function testParse($useragent, $os)
+    {
+        $osParser = new OperatingSystem();
+        $osParser->setUserAgent($useragent);
+        $this->assertEquals($os, $osParser->parse());
+        self::$osTested[] = $os['short_name'];
+    }
+
+    public function getFixtures()
+    {
+        $fixtureData = \Spyc::YAMLLoad(realpath(dirname(__FILE__)) . '/fixtures/oss.yml');
+        return $fixtureData;
+    }
+
     /**
      * @dataProvider getAllOs
      */
@@ -28,6 +47,22 @@ public function getAllOs()
         return $allOs;
     }
 
+    /**
+     * @dataProvider getAllFamilyOs
+     */
+    public function testFamilyOSExists($os)
+    {
+        $allOs = array_keys(OperatingSystem::getAvailableOperatingSystems());
+        $this->assertContains($os, $allOs);
+    }
+
+    public function getAllFamilyOs()
+    {
+        $allFamilyOs = call_user_func_array('array_merge', OperatingSystem::getAvailableOperatingSystemFamilies());
+        $allFamilyOs = array_map(function($os){ return array($os); }, $allFamilyOs);
+        return $allFamilyOs;
+    }
+
     public function testGetAvailableOperatingSystems()
     {
         $this->assertGreaterThan(70, OperatingSystem::getAvailableOperatingSystems());
@@ -50,4 +85,11 @@ public function getNameFromIds()
             array('XXX', '4.5', false),
         );
     }
+
+    public function testAllBrowsersTested()
+    {
+        $allBrowsers = array_keys(OperatingSystem::getAvailableOperatingSystems());
+        $osNotTested = array_diff($allBrowsers, self::$osTested);
+        $this->assertEmpty($osNotTested, 'Following browsers are not tested: '.implode(', ', $osNotTested));
+    }
 }