[496466] Fix TabBarTest test (again)

The previous fix [1] is partial and does not cover the case resolved
with commit [2].

[1] 
http://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=673b4de0eeb06cc87c15295bd741a0f465dc4a61
[2] 
http://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=1dcd33112221bba76fdc3f9a3657deb1dd00d5a6

Bug: 496466
Change-Id: I42b969d82f89828e1c1f58dcb06aba6043182f1c
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

1 files changed, 5 insertions, 6 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java
index 6ce4959876..cde3eaca1e 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tabbar/TabBarTest.java
@@ -509,6 +509,11 @@ public class TabBarTest extends AbstractSiriusSwtBotGefTestCase {
             SWTBotToolbarDropDownButton toolbarDropDownButton = editor.bot().toolbarDropDownButton(i);
             String expectedTooltip = DIAGRAM_TOOLBARDROPDOWNBUTTONS_TOOLTIPS[i];
             assertEquals("The toolbarDropDownButton index " + i + " does not have the expected tooltip", expectedTooltip, toolbarDropDownButton.getToolTipText());
+            if (expectedTooltip.equals(Messages.PasteFormatAction_toolTipText)) {
+                // Paste layout is not enabled if there is no previous copy
+                // layout.
+                continue;
+            }
             assertTrue("The toolbarDropDownButton with tooltip " + expectedTooltip + " should be enabled", toolbarDropDownButton.isEnabled());
         }
         for (int i = 0; i < diagramSelectedTabbarButtons.size(); i++) {
@@ -520,12 +525,6 @@ public class TabBarTest extends AbstractSiriusSwtBotGefTestCase {
             } else {
                 assertEquals("The toolbarButton index " + i + " does not have the expected tooltip", expectedTooltip, editor.bot().toolbarButton(i).getToolTipText());
             }
-
-            if (expectedTooltip.equals(Messages.PasteFormatAction_toolTipText)) {
-                // Paste layout is not enabled if there is no previous copy
-                // layout.
-                continue;
-            }
             assertTrue("The toolbarButton with tooltip " + expectedTooltip + " should be enabled", button.isEnabled());
         }
         for (int i = 0; i < DIAGRAM_TOOLBARTOGGLEBUTTONS_TOOLTIPS.length; i++) {