[Libreoffice-commits] core.git: sfx2/qa

kerem hallackerem at gmail.com
Tue Dec 20 23:35:08 UTC 2016


 sfx2/qa/python/check_sidebar.py          |  112 +++++++++++++++----------------
 sfx2/qa/python/check_sidebar_registry.py |   20 ++---
 2 files changed, 66 insertions(+), 66 deletions(-)

New commits:
commit 027a41959cc722fb9e3e7e2375eac9a3703d4799
Author: kerem <hallackerem at gmail.com>
Date:   Sat Dec 17 15:53:34 2016 +0200

    tdf#97361: Changed naming in sfx2 python tests
    
    Change-Id: Iabacaff8fd7f282a903885954a7d725ceb6f6c16
    Reviewed-on: https://gerrit.libreoffice.org/32118
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/qa/python/check_sidebar.py b/sfx2/qa/python/check_sidebar.py
index 1795832..40ca194 100644
--- a/sfx2/qa/python/check_sidebar.py
+++ b/sfx2/qa/python/check_sidebar.py
@@ -53,116 +53,116 @@ class CheckSidebar(unittest.TestCase):
 
         xDecks = xSidebar.getDecks()
 
-        firstDeckName = "PropertyDeck";
+        first_deck_name = "PropertyDeck";
 
-        deckElementNames = xDecks.getElementNames()
-        assert ( firstDeckName in deckElementNames )
-        assert ( xDecks.hasByName(firstDeckName) )
+        deck_element_names = xDecks.getElementNames()
+        assert ( first_deck_name in deck_element_names )
+        assert ( xDecks.hasByName(first_deck_name) )
 
-        decksCount = xDecks.getCount()
-        self.assertEqual ( 5, decksCount )
+        decks_count = xDecks.getCount()
+        self.assertEqual ( 5, decks_count )
 
-        xDeck = xDecks.getByName(firstDeckName)
+        xDeck = xDecks.getByName(first_deck_name)
         assert ( xDeck )
-        assert ( xDeck.getId() == firstDeckName )
+        assert ( xDeck.getId() == first_deck_name )
 
-        newDeckTitle = "New title"
-        xDeck.setTitle(newDeckTitle)
-        assert ( xDeck.getTitle() == newDeckTitle )
+        new_deck_title = "New title"
+        xDeck.setTitle(new_deck_title)
+        assert ( xDeck.getTitle() == new_deck_title )
 
         xDeck.moveFirst()
-        initialIndex = xDeck.getOrderIndex()
-        self.assertEqual(100, initialIndex)
+        initial_index = xDeck.getOrderIndex()
+        self.assertEqual(100, initial_index)
 
         xDeck.moveLast()
-        assert ( xDeck.getOrderIndex() > initialIndex )
+        assert ( xDeck.getOrderIndex() > initial_index )
 
-        initialIndex = xDeck.getOrderIndex()
+        initial_index = xDeck.getOrderIndex()
         xDeck.moveFirst()
-        assert ( xDeck.getOrderIndex() < initialIndex )
+        assert ( xDeck.getOrderIndex() < initial_index )
 
-        initialIndex = xDeck.getOrderIndex()
+        initial_index = xDeck.getOrderIndex()
         xDeck.moveDown()
-        assert ( xDeck.getOrderIndex() > initialIndex )
+        assert ( xDeck.getOrderIndex() > initial_index )
 
-        initialIndex = xDeck.getOrderIndex()
+        initial_index = xDeck.getOrderIndex()
         xDeck.moveUp()
-        assert ( xDeck.getOrderIndex() < initialIndex )
+        assert ( xDeck.getOrderIndex() < initial_index )
 
         xPanels = xDeck.getPanels()
 
-        panelsCount = xPanels.getCount()
-        self.assertEqual ( panelsCount, 5 )
+        panels_count = xPanels.getCount()
+        self.assertEqual ( panels_count, 5 )
 
-        firstPanelName = self.getFirstPanel(xPanels)
+        first_panel_name = self.getFirstPanel(xPanels)
 
-        panelElementNames = xPanels.getElementNames()
-        assert ( firstPanelName in panelElementNames )
-        assert ( xPanels.hasByName(firstPanelName) )
+        panel_element_names = xPanels.getElementNames()
+        assert ( first_panel_name in panel_element_names )
+        assert ( xPanels.hasByName(first_panel_name) )
 
-        xPanel = xPanels.getByName(firstPanelName)
+        xPanel = xPanels.getByName(first_panel_name)
         assert ( xPanel )
-        assert ( xPanel.getId() == firstPanelName )
+        assert ( xPanel.getId() == first_panel_name )
 
-        newTitle = "New title"
-        xPanel.setTitle(newTitle)
-        assert ( xPanel.getTitle() == newTitle )
+        new_title = "New title"
+        xPanel.setTitle(new_title)
+        assert ( xPanel.getTitle() == new_title )
 
-        initialIndex = xPanel.getOrderIndex()
+        initial_index = xPanel.getOrderIndex()
         xPanel.moveLast()
-        assert ( xPanel.getOrderIndex() > initialIndex )
+        assert ( xPanel.getOrderIndex() > initial_index )
 
-        initialIndex = xPanel.getOrderIndex()
+        initial_index = xPanel.getOrderIndex()
         xPanel.moveFirst()
-        assert ( xPanel.getOrderIndex() < initialIndex )
+        assert ( xPanel.getOrderIndex() < initial_index )
 
-        initialIndex = xPanel.getOrderIndex()
+        initial_index = xPanel.getOrderIndex()
         xPanel.moveDown()
-        assert ( xPanel.getOrderIndex() > initialIndex )
+        assert ( xPanel.getOrderIndex() > initial_index )
 
-        initialIndex = xPanel.getOrderIndex()
+        initial_index = xPanel.getOrderIndex()
         xPanel.moveUp()
-        assert ( xPanel.getOrderIndex() < initialIndex )
+        assert ( xPanel.getOrderIndex() < initial_index )
 
         xPanel.collapse()
         assert( not xPanel.isExpanded() )
 
-        lastPanelName = self.getLastPanel(xPanels)
+        last_panel_name = self.getLastPanel(xPanels)
 
-        otherPanel = xPanels.getByName(lastPanelName)
-        otherPanel.expand(False)
-        assert( otherPanel.isExpanded() )
+        other_panel = xPanels.getByName(last_panel_name)
+        other_panel.expand(False)
+        assert( other_panel.isExpanded() )
 
         xPanel.expand(True)
         assert( xPanel.isExpanded() )
-        assert( not otherPanel.isExpanded() )
+        assert( not other_panel.isExpanded() )
 
     # close the document
         xDoc.dispose()
 
     def getFirstPanel(self, xPanels):
 
-        panelName = ""
-        curIndex = 10000
+        panel_name = ""
+        cur_index = 10000
 
         for panel in xPanels:
-            if panel.getOrderIndex() < curIndex:
-                panelName = panel.getId()
-                curIndex = panel.getOrderIndex()
+            if panel.getOrderIndex() < cur_index:
+                panel_name = panel.getId()
+                cur_index = panel.getOrderIndex()
 
-        return panelName
+        return panel_name
 
     def getLastPanel(self, xPanels):
 
-        panelName = ""
-        curIndex = 0
+        panel_name = ""
+        cur_index = 0
 
         for panel in xPanels:
-            if panel.getOrderIndex() > curIndex:
-                panelName = panel.getId()
-                curIndex = panel.getOrderIndex()
+            if panel.getOrderIndex() > cur_index:
+                panel_name = panel.getId()
+                cur_index = panel.getOrderIndex()
 
-        return panelName
+        return panel_name
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/sfx2/qa/python/check_sidebar_registry.py b/sfx2/qa/python/check_sidebar_registry.py
index 19a8ae7..e77c08f 100644
--- a/sfx2/qa/python/check_sidebar_registry.py
+++ b/sfx2/qa/python/check_sidebar_registry.py
@@ -31,7 +31,7 @@ class CheckSidebarRegistry(unittest.TestCase):
         result = True
 
         #open registry node in Sidebar.xcu
-        configProvider = self.createUnoService("com.sun.star.configuration.ConfigurationProvider")
+        config_provider = self.createUnoService("com.sun.star.configuration.ConfigurationProvider")
 
         param = uno.createUnoStruct('com.sun.star.beans.PropertyValue')
         param.Name = "nodepath"
@@ -41,11 +41,11 @@ class CheckSidebarRegistry(unittest.TestCase):
 
         param.Value = "org.openoffice.Office.UI.Sidebar/Content/DeckList"
 
-        sidebarDecksSettings = configProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess",
+        sidebar_decks_settings = config_provider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess",
                                                                     (param, ))
-        for nodeName in sidebarDecksSettings:
+        for nodeName in sidebar_decks_settings:
 
-            node = sidebarDecksSettings.getByName(nodeName)
+            node = sidebar_decks_settings.getByName(nodeName)
 
             if (node.Id != nodeName):
                 print("\nNon-consistent sidebar.xcu Deck registry names", nodeName, node.Id)
@@ -55,11 +55,11 @@ class CheckSidebarRegistry(unittest.TestCase):
 
         param.Value = "org.openoffice.Office.UI.Sidebar/Content/PanelList"
 
-        sidebarPanelsSettings = configProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess",
+        sidebar_panels_settings = config_provider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationAccess",
                                                                     (param, ))
-        for nodeName in sidebarPanelsSettings:
+        for nodeName in sidebar_panels_settings:
 
-            node = sidebarPanelsSettings.getByName(nodeName)
+            node = sidebar_panels_settings.getByName(nodeName)
 
             if (node.Id != nodeName):
                 print("\nNon-consistent sidebar.xcu Panel registry names", nodeName, node.Id)
@@ -67,9 +67,9 @@ class CheckSidebarRegistry(unittest.TestCase):
 
             # is panel bound to an existing Deck ?
             FoundDeckId = False
-            for deckNodeName in sidebarDecksSettings:
-                deckNode = sidebarDecksSettings.getByName(deckNodeName)
-                if (node.DeckId == deckNode.Id):
+            for deckNodeName in sidebar_decks_settings:
+                deck_node = sidebar_decks_settings.getByName(deckNodeName)
+                if (node.DeckId == deck_node.Id):
                     FoundDeckId = True
             if not FoundDeckId:
                 print("\nNon existing DeckId for the panel ",node.Id)


More information about the Libreoffice-commits mailing list