working on modelingBot

15 files changed, 60 insertions, 356 deletions

diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore b/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore
index 97200ca0c..7bec85d19 100644
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore
+++ b/tests/org.eclipse.emf.examples.eef.tests.junit/.gitignore
@@ -1,2 +1,4 @@
 bin
 *Local.launch
+/screenshots
+/target
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF
index 6b5b16be6..9760e47db 100644
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.examples.eef.tests.junit/META-INF/MANIFEST.MF
@@ -2,13 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: test
 Bundle-SymbolicName: org.eclipse.emf.examples.eef.tests.junit
-Bundle-Version: 1.0.0
+Bundle-Version: 2.0.0.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
+ org.eclipse.jdt.ui,
  org.eclipse.emf.eef.runtime.tests,
  org.eclipse.emf.examples.eef.edit,
- org.junit4,
- org.eclipse.emf.eef.modelingbot.edit
+ org.eclipse.emf.eef.modelingbot.editor,
+ org.eclipse.swtbot.go,
+ org.apache.log4j,
+ org.eclipse.emf.examples.eef.editor
+Eclipse-RegisterBuddy: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.samples.conference.tests.junit
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch b/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch
index 93cc8e2e7..14989193b 100644
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch
+++ b/tests/org.eclipse.emf.examples.eef.tests.junit/eef.examples.tests.launch
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
 <booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
 <booleanAttribute key="askclear" value="false"/>
 <booleanAttribute key="automaticAdd" value="true"/>
 <booleanAttribute key="automaticValidate" value="false"/>
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot
deleted file mode 100644
index 80e00c245..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0">
-  <propertiesEditionContext href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/>
-  <sequences xsi:type="eef-mbot:Scenario" name="Site" documentation="Test Site PropertiesEditingComponent">
-    <processings xsi:type="eef-test:CreateProject" name="test project" documentation="Create the test project" projectName="conference_Site"/>
-    <processings xsi:type="eef-test:CreateModel" name="test model" documentation="Create the test model" modelName="test_Site.conference" path="conference_Site">
-      <root href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/>
-    </processings>
-    <processings xsi:type="eef-mbot:DetailsPage">
-      <processings xsi:type="eef-test_1:Add" name="site to test" documentation="Create the site to test" referenceableObject="//@sequences.0/@processings.1">
-        <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Site"/>
-        <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/sites"/>
-      </processings>
-      <processings xsi:type="eef-test_1:SetAttribute" name="name - value 'Site1'" documentation="Set the value 'Site1' to the name of the Site" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="Site1">
-        <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBPJkmEd6sxtwdpecy3w"/>
-      </processings>
-      <processings xsi:type="eef-test_1:Check"/>
-    </processings>
-    <processings xsi:type="eef-test:Save"/>
-    <processings xsi:type="eef-test:RemoveProject" name="test project" documentation="Deletre the test project" projectName="conference_Site"/>
-  </sequences>
-</eef-mbot:ModelingBot>
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot
deleted file mode 100644
index 2d2961065..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0">
-  <propertiesEditionContext href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/>
-  <sequences xsi:type="eef-mbot:Scenario">
-    <processings xsi:type="eef-test:CreateProject" name="TestText" projectName="TestText"/>
-    <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestText">
-      <root href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/>
-    </processings>
-    <processings xsi:type="eef-mbot:DetailsPage">
-      <processings xsi:type="eef-test_1:Add" name="participant" documentation="" referenceableObject="//@sequences.0/@processings.1">
-        <type href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/>
-        <eContainingFeature xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/>
-      </processings>
-      <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my first name">
-        <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-test_1:Check"/>
-    <processings xsi:type="eef-mbot:Wizard">
-      <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my other first name (yes because i have two first names)">
-        <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-test_1:Check"/>
-    <processings xsi:type="eef-mbot:DetailsPage">
-      <processings xsi:type="eef-test_1:Unset" name="name" referenceableObject="//@sequences.0/@processings.2/@processings.0">
-        <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <feature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-mbot:Wizard">
-      <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my other first name (yes because i have two first names)">
-        <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test_1:Unset" name="name" referenceableObject="//@sequences.0/@processings.2/@processings.0">
-        <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <feature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-mbot:DetailsPage" name="">
-      <processings xsi:type="eef-test_1:Remove" name="participant" referenceableObject="//@sequences.0/@processings.2/@processings.0"/>
-      <processings xsi:type="eef-test:Save"/>
-      <processings xsi:type="eef-test_1:Add" name="participant2" documentation="" referenceableObject="//@sequences.0/@processings.1">
-        <type href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/>
-        <eContainingFeature xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-mbot:Wizard">
-      <processings xsi:type="eef-test_1:Remove" name="participant" referenceableObject="//@sequences.0/@processings.8/@processings.2"/>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-test:RemoveProject" name="TestText" projectName="TestText"/>
-  </sequences>
-</eef-mbot:ModelingBot>
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot
deleted file mode 100644
index fcbe6d392..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0">
-  <propertiesEditionContext href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/>
-  <sequences xsi:type="eef-mbot:Scenario">
-    <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/>
-    <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestTableCompo">
-      <root href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/>
-    </processings>
-    <processings xsi:type="eef-test_1:Check"/>
-    <processings xsi:type="eef-mbot:DetailsPage">
-      <processings xsi:type="eef-test_1:Add" name="participant3" documentation="" referenceableObject="//@sequences.0/@processings.1">
-        <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/>
-        <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/>
-      </processings>
-      <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.3/@processings.0" value="my first name">
-        <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test_1:Add" name="site3" referenceableObject="//@sequences.0/@processings.1">
-        <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_P9i7gJktEd6sxtwdpecy3w"/>
-      </processings>
-      <processings xsi:type="eef-mbot:Wizard">
-        <processings xsi:type="eef-test_1:SetAttribute" name="site name" referenceableObject="//@sequences.0/@processings.3/@processings.2" value="My site">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_0lme4Bi5EeCOk6BuQTSdWA"/>
-        </processings>
-        <processings xsi:type="eef-test_1:SetAttribute" name="site doc" referenceableObject="//@sequences.0/@processings.3/@processings.2" value="My site">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBNZkmEd6sxtwdpecy3w"/>
-        </processings>
-        <processings xsi:type="eef-test_1:Add" name="room" documentation="" referenceableObject="//@sequences.0/@processings.3/@processings.2">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/>
-        </processings>
-        <processings xsi:type="eef-mbot:Wizard">
-          <processings xsi:type="eef-test_1:SetAttribute" name="name" referenceableObject="//@sequences.0/@processings.3/@processings.3/@processings.2" value="Room1">
-            <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_O_1wYG3dEeC0ELVFaUipLQ"/>
-          </processings>
-        </processings>
-        <processings xsi:type="eef-test_1:Remove" name="room" referenceableObject="//@sequences.0/@processings.3/@processings.3/@processings.2">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/>
-        </processings>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-test_1:Check"/>
-    <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/>
-  </sequences>
-</eef-mbot:ModelingBot>
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot
deleted file mode 100644
index a1d3e71dc..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0">
-  <propertiesEditionContext href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/>
-  <sequences xsi:type="eef-mbot:Scenario">
-    <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/>
-    <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestTableCompo">
-      <root href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/>
-    </processings>
-    <processings xsi:type="eef-mbot:DetailsPage">
-      <processings xsi:type="eef-test_1:Add" name="participant" documentation="" referenceableObject="//@sequences.0/@processings.1">
-        <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/>
-        <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/>
-      </processings>
-      <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.2/@processings.0" value="my first name">
-        <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test_1:Add" name="site" referenceableObject="//@sequences.0/@processings.1">
-        <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_P9i7gJktEd6sxtwdpecy3w"/>
-      </processings>
-      <processings xsi:type="eef-mbot:Wizard">
-        <processings xsi:type="eef-test_1:SetAttribute" name="site name" referenceableObject="//@sequences.0/@processings.2/@processings.2" value="My site">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_0lme4Bi5EeCOk6BuQTSdWA"/>
-        </processings>
-        <processings xsi:type="eef-test_1:SetAttribute" name="site doc" referenceableObject="//@sequences.0/@processings.2/@processings.2" value="My site">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBNZkmEd6sxtwdpecy3w"/>
-        </processings>
-        <processings xsi:type="eef-test_1:Add" name="participant2" documentation="" referenceableObject="//@sequences.0/@processings.2/@processings.2">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/>
-        </processings>
-        <processings xsi:type="eef-mbot:Wizard">
-          <processings xsi:type="eef-test_1:SetAttribute" name="room1" referenceableObject="//@sequences.0/@processings.2/@processings.3/@processings.2" value="my second first name">
-            <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_O_1wYG3dEeC0ELVFaUipLQ"/>
-          </processings>
-        </processings>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-test_1:Check"/>
-    <processings xsi:type="eef-mbot:DetailsPage">
-      <processings xsi:type="eef-test_1:Add" name="participant3" documentation="" referenceableObject="//@sequences.0/@processings.1">
-        <type href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/>
-        <eContainingFeature xsi:type="ecore:EReference" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/>
-      </processings>
-      <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.4/@processings.0" value="my first name">
-        <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test_1:Add" name="site3" referenceableObject="//@sequences.0/@processings.1">
-        <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_P9i7gJktEd6sxtwdpecy3w"/>
-      </processings>
-      <processings xsi:type="eef-mbot:Wizard">
-        <processings xsi:type="eef-test_1:SetAttribute" name="site name" referenceableObject="//@sequences.0/@processings.4/@processings.2" value="My site">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_0lme4Bi5EeCOk6BuQTSdWA"/>
-        </processings>
-        <processings xsi:type="eef-test_1:SetAttribute" name="site doc" referenceableObject="//@sequences.0/@processings.4/@processings.2" value="My site">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBNZkmEd6sxtwdpecy3w"/>
-        </processings>
-        <processings xsi:type="eef-test_1:Add" name="participant2" documentation="" referenceableObject="//@sequences.0/@processings.4/@processings.2">
-          <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_r1ZxAG3eEeC0ELVFaUipLQ"/>
-        </processings>
-        <processings xsi:type="eef-mbot:Wizard">
-          <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.4/@processings.3/@processings.2" value="my second first name">
-            <propertiesEditionElement href="../../org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-            <eContainingFeature xsi:type="ecore:EAttribute" href="../../org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-          </processings>
-          <processings xsi:type="eef-test_1:Cancel"/>
-        </processings>
-        <processings xsi:type="eef-test_1:Cancel"/>
-      </processings>
-      <processings xsi:type="eef-test:Save"/>
-    </processings>
-    <processings xsi:type="eef-test:CloseEditor" path="TestTableCompo/test.conference"/>
-    <processings xsi:type="eef-test:CloseProject" projectName="TestTableCompo"/>
-    <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/>
-  </sequences>
-  <sequences xsi:type="eef-mbot:Scenario">
-    <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/>
-    <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/>
-  </sequences>
-</eef-mbot:ModelingBot>
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot b/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot
deleted file mode 100644
index 92334f2e8..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eef-mbot:ModelingBot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:eef-mbot="http://www.eclipse.org/emf/eef/mbot/1.0.0" xmlns:eef-test="http://www.eclipse.org/emf/eef/test/EclipseActions/1.0.0" xmlns:eef-test_1="http://www.eclipse.org/emf/eef/test/EEFActions/1.0.0">
-  <propertiesEditionContext href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvIaEJkmEd6sxtwdpecy3w"/>
-  <sequences xsi:type="eef-mbot:Scenario">
-    <processings xsi:type="eef-test:CreateProject" name="TestableCompo" projectName="TestTableCompo"/>
-    <processings xsi:type="eef-test:CreateModel" name="conference" documentation="" modelName="test.conference" path="TestTableCompo">
-      <root href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference"/>
-    </processings>
-    <processings xsi:type="eef-test_1:Check"/>
-    <processings xsi:type="eef-mbot:DetailsPage">
-      <processings xsi:type="eef-test_1:Add" name="participant3" documentation="" referenceableObject="//@sequences.0/@processings.1">
-        <type href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person"/>
-        <eContainingFeature xsi:type="ecore:EReference" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Conference/participants"/>
-      </processings>
-      <processings xsi:type="eef-test_1:Check"/>
-      <processings xsi:type="eef-test_1:SetAttribute" name="first name" referenceableObject="//@sequences.0/@processings.3/@processings.0" value="my first name">
-        <propertiesEditionElement href="platform:/resource/org.eclipse.emf.examples.eef.edit/models/conference.components#_KvJBKJkmEd6sxtwdpecy3w"/>
-        <eContainingFeature xsi:type="ecore:EAttribute" href="platform:/resource/org.eclipse.emf.examples.eef/model/conference.ecore#//Person/firstname"/>
-      </processings>
-      <processings xsi:type="eef-test_1:Check"/>
-    </processings>
-    <processings xsi:type="eef-test_1:Check"/>
-    <processings xsi:type="eef-test:RemoveProject" projectName="TestTableCompo"/>
-  </sequences>
-</eef-mbot:ModelingBot>
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java
index aac3435f8..923c0e07d 100644
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java
+++ b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllModelingBotTests.java
@@ -1,24 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2012 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.emf.samples.conference.tests.junit;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.ComposedBotModelingTestCase;
-import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.SWTBotModelingTestCase;
-import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.SWTBotModelingTestCase2;
-import org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional.SWTBotModelingTestCase3;
+import org.eclipse.emf.samples.conference.tests.junit.modelingbot.ComposedBotModelingTestCase;
+import org.eclipse.emf.samples.conference.tests.junit.modelingbot.ConferenceModelingBotTestCase;
+import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SWTBotModelingTestCase;
+import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SWTBotModelingTestCase2;
+import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SWTBotModelingTestCase3;
+import org.eclipse.emf.samples.conference.tests.junit.modelingbot.SiteModelingBotTestCase;
 
 public class AllModelingBotTests {
 
 	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for modeling bot on Conference");
-		//$JUnit-BEGIN$
+		TestSuite suite = new TestSuite("Test for modeling bot on Conference");
+		// $JUnit-BEGIN$
+		suite.addTestSuite(ConferenceModelingBotTestCase.class);
+		suite.addTestSuite(SiteModelingBotTestCase.class);
+		suite.addTestSuite(ComposedBotModelingTestCase.class);
+		suite.addTestSuite(SWTBotModelingTestCase.class);
 		suite.addTestSuite(SWTBotModelingTestCase2.class);
 		suite.addTestSuite(SWTBotModelingTestCase3.class);
-		suite.addTestSuite(SWTBotModelingTestCase.class);
-		suite.addTestSuite(ComposedBotModelingTestCase.class);
-		//$JUnit-END$
+		// $JUnit-END$
 		return suite;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java
index bffc16168..54d07c1a7 100644
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java
+++ b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/AllTests.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2012 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.emf.samples.conference.tests.junit;
 
 import junit.framework.Test;
@@ -6,15 +16,14 @@ import junit.framework.TestSuite;
 public class AllTests {
 
 	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for org.eclipse.emf.samples.conference.tests.junit");
-		//$JUnit-BEGIN$
+		TestSuite suite = new TestSuite("Test for org.eclipse.emf.samples.conference.tests.junit");
+		// $JUnit-BEGIN$
 		suite.addTestSuite(TalkTestCase.class);
 		suite.addTestSuite(ConferenceTestCase.class);
 		suite.addTestSuite(SiteTestCase.class);
 		suite.addTestSuite(TopicTestCase.class);
 		suite.addTestSuite(PersonTestCase.class);
-		//$JUnit-END$
+		// $JUnit-END$
 		return suite;
 	}
 
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java
index cf7668b0e..c04712f27 100644
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java
+++ b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/SiteModelingBotTestCase.java
@@ -1,22 +1,30 @@
-/**
+/*******************************************************************************
+ * Copyright (c) 2008, 2012 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
- */
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
 package org.eclipse.emf.samples.conference.tests.junit.modelingbot;
 
-import org.eclipse.emf.eef.modelingBot.testcase.ComposedEEFBotModelingTestCase;
+import org.eclipse.emf.eef.modelingBot.testcase.AbstractEEFBotModelingTestCase;
 
 /**
  * @author <a href="goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
- *
  */
-public class SiteModelingBotTestCase extends ComposedEEFBotModelingTestCase {
+public class SiteModelingBotTestCase extends AbstractEEFBotModelingTestCase {
 
 	/**
 	 * {@inheritDoc}
-	 * @see org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase#testModelingBot()
+	 * 
+	 * @see org.eclipse.emf.eef.modelingBot.testcase.AbstractEEFBotModelingTestCase#testModelingBot()
 	 */
 	public void testModelingBot() throws Exception {
-		composedBot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/conference_Site.modelingbot");
+		composedBot
+				.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/modelingbot/conference_Site.modelingbot");
 	}
 
 }
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/ComposedBotModelingTestCase.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/ComposedBotModelingTestCase.java
deleted file mode 100644
index 47ed56ecf..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/ComposedBotModelingTestCase.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional;
-/*******************************************************************************
- * Copyright (c) 2011 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-
-
-/**
- * @author nlepine
- *
- */
-public class ComposedBotModelingTestCase extends org.eclipse.emf.eef.modelingBot.testcase.ComposedEEFBotModelingTestCase {
-	public void testModelingBot() throws Exception {
-		composedBot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/check.modelingbot");
-	}
-	
-}
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase.java
deleted file mode 100644
index 2d48ea40d..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional;
-/*******************************************************************************
- * Copyright (c) 2011 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-
-
-/**
- * @author nlepine
- *
- */
-public class SWTBotModelingTestCase extends org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase {
-	
-	public void testModelingBot() throws Exception {
-		bot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/My.modelingbot");
-	}
-	
-}
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase2.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase2.java
deleted file mode 100644
index 3bc2f6c10..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional;
-/*******************************************************************************
- * Copyright (c) 2011 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-
-
-/**
- * @author nlepine
- *
- */
-public class SWTBotModelingTestCase2 extends org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase {
-	
-	public void testModelingBot() throws Exception {
-		bot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/My2.modelingbot");
-	}
-	
-}
diff --git a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase3.java b/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase3.java
deleted file mode 100644
index 50fbdf8bb..000000000
--- a/tests/org.eclipse.emf.examples.eef.tests.junit/src/org/eclipse/emf/samples/conference/tests/junit/modelingbot/functional/SWTBotModelingTestCase3.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.emf.samples.conference.tests.junit.modelingbot.functional;
-/*******************************************************************************
- * Copyright (c) 2011 Obeo.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Obeo - initial API and implementation
- *******************************************************************************/
-
-
-/**
- * @author nlepine
- *
- */
-public class SWTBotModelingTestCase3 extends org.eclipse.emf.eef.modelingBot.testcase.SWTBotModelingBotTestCase {
-	
-	public void testModelingBot() throws Exception {
-		bot.runModelingBot("org.eclipse.emf.examples.eef.tests.junit/models/functional/My3.modelingbot");
-	}
-	
-}