Separating plugins test for individual platforms

functional/plugins_check.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import sys
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
 
 
 class PluginsCheck(pyauto.PyUITest):
   """TestCase for Plugins."""
 
-  def _ReadPluginsList(self):
+  def _ReadPluginsList(self, plugins_list_file):
     """Read test plugins list from a file based on the test platform
 
     File contains list of plugins like,
     [
     {u'name':'Shockwave Flash', u'enabled':True, u'version':u'10.2.154.9'}
     {u'name':'Chrome PDF Viewer', u'enabled':True, u'version':u''}
     ...
     ]
     """
-    file_path = os.path.join(self.DataDir(), 'plugins_list.txt')
+    file_path = os.path.join(self.DataDir(), plugins_list_file)
     return self.EvalDataFrom(file_path)
 
   def testPluginsStates(self):
     """Verify plugins' versions and states."""
-    if self.IsLinux():
+    if self.IsWin():
+      plugins_list = self._ReadPluginsList('win_plugins_list.txt')
+    elif self.IsMac():
+      plugins_list = self._ReadPluginsList('mac_plugins_list.txt')
+    elif self.IsLinux():
       # TODO(rohitbm)
       # Add plugins_check support for Linux
       logging.debug('Not performing plugins check on linux')
       return
+
     browser_plugins_list = self.GetPluginsInfo().Plugins()
-    version_sep = '.'
-    if self.IsWin():
-      # Windows flash plugin version uses |,| instead of |.|
-      version_sep = ','
-    for plugin in self._ReadPluginsList(): 
+    for plugin in plugins_list: 
       test_plugin = [x['name'] for x in browser_plugins_list \
-          if x['version'] == plugin['version'].replace('.', version_sep) and \
+          if x['version'] == plugin['version'] and \
              str(x['enabled']) == plugin['enabled'] and \
              x['name'] == plugin['name']]
       plugin_info = '[ NAME : %s, VERSION: %s, ENABLED: %s]' % \
           (plugin['name'], plugin['version'], plugin['enabled'])
       logging.debug(plugin_info)
       self.assertTrue(test_plugin, '%s - Failed to match with plugins'
           ' available in the browser plugins list' % plugin_info)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()