[424422] Fix TreeItemStyleDescriptionTestv3.0.0rc1

Bug:424422
Change-Id: I8a7884363913b6de12eb8274bba374e511d0a36c
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

3 files changed, 13 insertions, 4 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/widget/TreeItemLabelFontFormatQuery.java b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/widget/TreeItemLabelFontFormatQuery.java
index 6f505a1929..c416a48182 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/widget/TreeItemLabelFontFormatQuery.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/widget/TreeItemLabelFontFormatQuery.java
@@ -79,7 +79,12 @@ public class TreeItemLabelFontFormatQuery extends RunnableWithResult.Impl<List<F
             case SWT.ITALIC:
                 FontFormatHelper.setFontFormat(treeItemLabelFormat, FontFormat.ITALIC_LITERAL);
                 break;
+            case SWT.BOLD | SWT.ITALIC:
+                FontFormatHelper.setFontFormat(treeItemLabelFormat, FontFormat.BOLD_LITERAL);
+                FontFormatHelper.setFontFormat(treeItemLabelFormat, FontFormat.ITALIC_LITERAL);
+                break;
             default:
+                break;
             }
         }
         setResult(treeItemLabelFormat);
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/utils/SWTBotUtils.java b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/utils/SWTBotUtils.java
index c617120f78..98b6b9c079 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/utils/SWTBotUtils.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/utils/SWTBotUtils.java
@@ -394,6 +394,10 @@ public final class SWTBotUtils {
                     case SWT.ITALIC:
                         FontFormatHelper.setFontFormat(result, FontFormat.ITALIC_LITERAL);
                         break;
+                    case SWT.BOLD | SWT.ITALIC:
+                        FontFormatHelper.setFontFormat(result, FontFormat.BOLD_LITERAL);
+                        FontFormatHelper.setFontFormat(result, FontFormat.ITALIC_LITERAL);
+                        break;
                     default:
                         break;
                     }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tree/TreeItemStyleDescriptionTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tree/TreeItemStyleDescriptionTest.java
index 24ae1b44a7..b59f86a411 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tree/TreeItemStyleDescriptionTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/tree/TreeItemStyleDescriptionTest.java
@@ -492,7 +492,7 @@ public class TreeItemStyleDescriptionTest extends AbstractTreeSiriusSWTBotGefTes
         assertThat(labelExpression, equalTo("Testnew EClass 1"));
         // assertThat(labelAlignment, equalTo("RIGHT"));
         List<String> actual = labelFormat;
-        List<String> expected = Arrays.asList("bold", "italic");
+        List<String> expected = Arrays.asList("italic", "bold");
         assertThat(actual, is(expected));
         assertThat(colorBackground, equalTo(black));
         assertThat(labelColor, equalTo(blue));
@@ -510,10 +510,10 @@ public class TreeItemStyleDescriptionTest extends AbstractTreeSiriusSWTBotGefTes
      */
     private void changeAndTestPropertyTabLabel() {
         // Retrieve show icon check
-        assertFalse(bot.viewByTitle(PROPERTIES).bot().checkBox(2).isChecked());
+        assertFalse(bot.viewByTitle(PROPERTIES).bot().checkBox(4).isChecked());
         // Check show icon
-        bot.viewByTitle(PROPERTIES).bot().checkBox(2).click();
-        assertTrue(bot.viewByTitle(PROPERTIES).bot().checkBox(2).isChecked());
+        bot.viewByTitle(PROPERTIES).bot().checkBox(4).click();
+        assertTrue(bot.viewByTitle(PROPERTIES).bot().checkBox(4).isChecked());
     }
 
     /**