[467512] Rewrite test to use an ecore model

The sample basic family metamodel is not available in tests jobs.

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

7 files changed, 60 insertions, 51 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/extension/My.basicfamily b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/extension/My.basicfamily
deleted file mode 100644
index 204b37dc9e..0000000000
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/extension/My.basicfamily
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<basicfamily:Family xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basicfamily="http://www.eclipse.org/sirius/sample/basicfamily">
-  <members xsi:type="basicfamily:Man" name="Paul" children="//@members.1 //@members.2"/>
-  <members xsi:type="basicfamily:Man" name="Elias" children="//@members.3 //@members.6 //@members.5 //@members.9" parents="//@members.0 //@members.8"/>
-  <members xsi:type="basicfamily:Woman" name="Lisa" children="//@members.3 //@members.6" parents="//@members.0"/>
-  <members xsi:type="basicfamily:Man" name="Dave" children="//@members.4 //@members.7" parents="//@members.1 //@members.2"/>
-  <members xsi:type="basicfamily:Man" name="Alain" parents="//@members.3 //@members.5"/>
-  <members xsi:type="basicfamily:Woman" name="Anna" children="//@members.4" parents="//@members.1"/>
-  <members xsi:type="basicfamily:Man" name="Bryan" parents="//@members.1 //@members.2"/>
-  <members xsi:type="basicfamily:Woman" name="Fiona" parents="//@members.3"/>
-  <members xsi:type="basicfamily:Man" name="Albert" children="//@members.1"/>
-  <members xsi:type="basicfamily:Woman" name="Clara" parents="//@members.1"/>
-</basicfamily:Family>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/My.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/My.aird
new file mode 100644
index 0000000000..fff40c0358
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/My.aird
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description" xmi:id="_Cx5V8CvEEeWSX-jWVe8JSA" selectedViews="_Ds3wcCvEEeWSX-jWVe8JSA _DtO80CvEEeWSX-jWVe8JSA" version="10.1.0.201507101000">
+  <semanticResources>My.ecore</semanticResources>
+  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_Ds3wcCvEEeWSX-jWVe8JSA">
+    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_E02sMCvEEeWSX-jWVe8JSA" name="new classDiagram">
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_E04hYCvEEeWSX-jWVe8JSA" source="DANNOTATION_CUSTOMIZATION_KEY">
+        <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_E04hYSvEEeWSX-jWVe8JSA"/>
+      </ownedAnnotationEntries>
+      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_E1MqcCvEEeWSX-jWVe8JSA" source="GMF_DIAGRAMS">
+        <data xmi:type="notation:Diagram" xmi:id="_E1NRgCvEEeWSX-jWVe8JSA" type="Sirius" element="_E02sMCvEEeWSX-jWVe8JSA" measurementUnit="Pixel">
+          <styles xmi:type="notation:DiagramStyle" xmi:id="_E1NRgSvEEeWSX-jWVe8JSA"/>
+        </data>
+      </ownedAnnotationEntries>
+      <description xmi:type="description_1:DiagramDescription" href="main.odesign#//@ownedViewpoints[name='classes']/@ownedRepresentations[name='classDiagram']"/>
+      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_E04hYivEEeWSX-jWVe8JSA"/>
+      <activatedLayers xmi:type="description_1:Layer" href="main.odesign#//@ownedViewpoints[name='classes']/@ownedRepresentations[name='classDiagram']/@defaultLayer"/>
+      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+    </ownedRepresentations>
+    <viewpoint xmi:type="description:Viewpoint" href="main.odesign#//@ownedViewpoints[name='classes']"/>
+  </ownedViews>
+  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_DtO80CvEEeWSX-jWVe8JSA">
+    <viewpoint xmi:type="description:Viewpoint" href="extended.odesign#//@ownedViewpoints[name='others']"/>
+  </ownedViews>
+</viewpoint:DAnalysis>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/My.ecore b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/My.ecore
new file mode 100644
index 0000000000..efd42a9be5
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/My.ecore
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    name=""/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/extension/extended.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/extended.odesign
index 49eb7ffc1b..a9a2f08435 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/extension/extended.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/extended.odesign
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="extended" version="10.0.0.201505222000">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="extended" version="10.1.0.201507101000">
   <ownedViewpoints name="others">
-    <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="others" viewpointURI="viewpoint:/DesignerTestProject/persons" representationName="personsDiagram">
+    <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="others" viewpointURI="viewpoint:/DesignerTestProject/classes" representationName="classDiagram">
       <layers name="Others_Layer_1">
-        <nodeMappings name="WomanNode" semanticCandidatesExpression="feature:members" domainClass="basicfamily.Woman">
+        <nodeMappings name="EEnumNode" semanticCandidatesExpression="feature:eClassifiers" domainClass="ecore.EEnum">
           <style xsi:type="style:SquareDescription" labelExpression="[name/]" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -11,7 +11,7 @@
           </style>
         </nodeMappings>
         <toolSections name="OtherTools">
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createWoman_1" nodeMappings="//@ownedViewpoints[name='others']/@ownedRepresentationExtensions[name='others']/@layers[name='Others_Layer_1']/@nodeMappings[name='WomanNode']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createEEnum_1" nodeMappings="//@ownedViewpoints[name='others']/@ownedRepresentationExtensions[name='others']/@layers[name='Others_Layer_1']/@nodeMappings[name='EEnumNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
@@ -21,15 +21,15 @@
         </toolSections>
       </layers>
       <layers name="Others_Layer_2">
-        <nodeMappings name="WomanNode" semanticCandidatesExpression="feature:members" domainClass="basicfamily.Woman">
+        <nodeMappings name="EEnumNode2" semanticCandidatesExpression="feature:eClassifiers" domainClass="ecore.EEnum">
           <style xsi:type="style:SquareDescription" labelExpression="[name/]" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </nodeMappings>
-        <toolSections name="OtherTools">
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createWoman_2" nodeMappings="//@ownedViewpoints[name='others']/@ownedRepresentationExtensions[name='others']/@layers[name='Others_Layer_2']/@nodeMappings[name='WomanNode']">
+        <toolSections name="Tools">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createEEnum_2" nodeMappings="//@ownedViewpoints[name='others']/@ownedRepresentationExtensions[name='others']/@layers[name='Others_Layer_2']/@nodeMappings[name='EEnumNode2']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/extension/family.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/main.odesign
index b56092007c..8d278a2710 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/extension/family.odesign
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/palette/extension/main.odesign
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="10.0.0.201505222000">
-  <ownedViewpoints name="persons">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="personsDiagram" domainClass="basicfamily.Family">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="10.1.0.201507101000">
+  <ownedViewpoints name="classes">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="classDiagram" domainClass="ecore.EPackage">
       <defaultLayer name="Default">
-        <nodeMappings name="Mannode" semanticCandidatesExpression="feature:members" domainClass="basicfamily.Man">
+        <nodeMappings name="ClassNode" semanticCandidatesExpression="feature:eClassifiers" domainClass="ecore.EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -11,30 +11,30 @@
           </style>
         </nodeMappings>
       </defaultLayer>
-      <additionalLayers name="Person_Layer_1" reusedMappings="//@ownedViewpoints[name='persons']/@ownedRepresentations[name='personsDiagram']/@defaultLayer/@nodeMappings[name='Mannode']" activeByDefault="true">
-        <toolSections name="PersonTools">
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createMan_1" nodeMappings="//@ownedViewpoints[name='persons']/@ownedRepresentations[name='personsDiagram']/@defaultLayer/@nodeMappings[name='Mannode']">
+      <additionalLayers name="Layer_1" reusedMappings="//@ownedViewpoints[name='classes']/@ownedRepresentations[name='classDiagram']/@defaultLayer/@nodeMappings[name='ClassNode']" activeByDefault="true">
+        <toolSections name="Tools">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createClass_1" nodeMappings="//@ownedViewpoints[name='classes']/@ownedRepresentations[name='classDiagram']/@defaultLayer/@nodeMappings[name='ClassNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Man" referenceName="members">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['man'+container.members->filter(Man)->size()/] "/>
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['Class'+container.ownedClassifiers->filter(EClass)->size()/] "/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
         </toolSections>
       </additionalLayers>
-      <additionalLayers name="Person_Layer_2">
-        <toolSections name="PersonTools">
-          <ownedTools xsi:type="tool:NodeCreationDescription" name="createMan_2" nodeMappings="//@ownedViewpoints[name='persons']/@ownedRepresentations[name='personsDiagram']/@defaultLayer/@nodeMappings[name='Mannode']">
+      <additionalLayers name="Layer_2">
+        <toolSections name="Tools">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createClass_2" nodeMappings="//@ownedViewpoints[name='classes']/@ownedRepresentations[name='classDiagram']/@defaultLayer/@nodeMappings[name='ClassNode']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Man" referenceName="members">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['man'+container.members->filter(Man)->size()/] "/>
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['Class'+container.ownedClassifiers->filter(EClass)->size()/] "/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteManagerAfterVSMSelectionChange.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteManagerAfterVSMSelectionChange.java
index b750ed9cb2..bab5304312 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteManagerAfterVSMSelectionChange.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteManagerAfterVSMSelectionChange.java
@@ -19,10 +19,8 @@ import org.eclipse.gef.palette.PaletteEntry;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.ui.tools.internal.palette.SectionPaletteDrawer;
 import org.eclipse.sirius.diagram.ui.tools.internal.palette.SiriusPaletteViewer;
-import org.eclipse.sirius.tests.SiriusTestsPlugin;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
-import org.eclipse.sirius.tests.swtbot.support.api.dialog.ExportAsImageHelper;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
 
 import com.google.common.base.Predicate;
@@ -41,37 +39,36 @@ public class PaletteManagerAfterVSMSelectionChange extends AbstractSiriusSwtBotG
 
     private static final String FILE_DIR = "/";
 
-    private static final String MODEL_NAME = "My.basicfamily";
+    private static final String MODEL_NAME = "My.ecore";
 
-    private static final String MODELER_NAME = "family.odesign";
+    private static final String MODELER_NAME = "main.odesign";
 
     private static final String MODELER_EXTENSION_NAME = "extended.odesign";
 
-    private static final String SESSION_NAME = "representations.aird";
+    private static final String SESSION_NAME = "my.aird";
 
-    private static final String REPRESENTATION_DESC_NAME = "personsDiagram";
+    private static final String REPRESENTATION_DESC_NAME = "classDiagram";
 
-    private static final String REPRESENTATION_INST_DESC_NAME = "new personsDiagram";
+    private static final String REPRESENTATION_INST_DESC_NAME = "new classDiagram";
 
     private static final String EXTENSION_VIEWPOINT_NAME = "others";
 
-    private static final String PERSON_LAYER_1 = "Person_Layer_1";
+    private static final String LAYER_1 = "Layer_1";
 
     private static final String OTHERS_LAYER_1 = "Others_Layer_1";
 
-    private static final SortedSet<String> EXPECTED_ENTRIES_LAYER_PERSON1_SHOWN = Sets.newTreeSet(Arrays.asList("createMan_1"));
+    private static final SortedSet<String> EXPECTED_ENTRIES_LAYER_PERSON1_SHOWN = Sets.newTreeSet(Arrays.asList("createClass_1"));
 
-    private static final SortedSet<String> EXPECTED_ENTRIES_LAYER_PERSON1_OTHERS1_SHOWN = Sets.newTreeSet(Arrays.asList("createMan_1", "createWoman_1"));
+    private static final SortedSet<String> EXPECTED_ENTRIES_LAYER_PERSON1_OTHERS1_SHOWN = Sets.newTreeSet(Arrays.asList("createClass_1", "createEEnum_1"));
 
     /**
      * {@inheritDoc}
      */
     @Override
     protected void onSetUpAfterOpeningDesignerPerspective() throws Exception {
-        copyFileToTestProject(SiriusTestsPlugin.PLUGIN_ID, DATA_UNIT_DIR, MODEL_NAME, SESSION_NAME, MODELER_NAME, MODELER_EXTENSION_NAME);
+        copyFileToTestProject(Activator.PLUGIN_ID, DATA_UNIT_DIR, MODEL_NAME, SESSION_NAME, MODELER_NAME, MODELER_EXTENSION_NAME);
         final UIResource sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_NAME);
         localSession = designerPerspective.openSessionFromFile(sessionAirdResource);
-        localSession.changeViewpointSelection(Sets.newHashSet(EXTENSION_VIEWPOINT_NAME), Sets.<String> newHashSet());
     }
 
     /**
@@ -81,7 +78,6 @@ public class PaletteManagerAfterVSMSelectionChange extends AbstractSiriusSwtBotG
     protected void tearDown() throws Exception {
         localSession = null;
         super.tearDown();
-        new ExportAsImageHelper().resetDialogSettings();
     }
 
     /**
@@ -93,10 +89,10 @@ public class PaletteManagerAfterVSMSelectionChange extends AbstractSiriusSwtBotG
      */
     public void testHideShowLayersAfterDiagramCreation() throws Exception {
         editor = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_DESC_NAME, REPRESENTATION_INST_DESC_NAME, DDiagram.class);
-        editor.changeLayerActivation(PERSON_LAYER_1);
+        editor.changeLayerActivation(LAYER_1);
         editor.changeLayerActivation(OTHERS_LAYER_1);
         assertEquals("Palette entries content is wrong", EXPECTED_ENTRIES_LAYER_PERSON1_OTHERS1_SHOWN, getVisiblePaletteEntries());
-        localSession.changeViewpointSelection(Sets.<String> newHashSet(), Collections.singleton(EXTENSION_VIEWPOINT_NAME));
+        localSession.changeViewpointSelection(Collections.<String> emptySet(), Collections.singleton(EXTENSION_VIEWPOINT_NAME));
         assertEquals("Palette entries content is wrong", EXPECTED_ENTRIES_LAYER_PERSON1_SHOWN, getVisiblePaletteEntries());
     }
 
@@ -117,6 +113,7 @@ public class PaletteManagerAfterVSMSelectionChange extends AbstractSiriusSwtBotG
         /**
          * {@inheritDoc}
          */
+        @Override
         public boolean apply(PaletteEntry input) {
             return input.isVisible();
         }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteViewManagementTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteViewManagementTest.java
index 2ac6654ebd..f0cd551e0f 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteViewManagementTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/PaletteViewManagementTest.java
@@ -14,7 +14,6 @@ import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.tests.swtbot.support.api.AbstractSiriusSwtBotGefTestCase;
 import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource;
 import org.eclipse.sirius.tests.swtbot.support.api.condition.CheckSelectedCondition;
-import org.eclipse.sirius.tests.swtbot.support.api.dialog.ExportAsImageHelper;
 import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor;
 import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
@@ -63,7 +62,6 @@ public class PaletteViewManagementTest extends AbstractSiriusSwtBotGefTestCase {
     protected void tearDown() throws Exception {
         localSession = null;
         super.tearDown();
-        new ExportAsImageHelper().resetDialogSettings();
     }
 
     /**