UPDATED: applied patch for tests

4 files changed, 15 insertions, 43 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/editSetReferenceRefTable.modelingbot b/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/editSetReferenceRefTable.modelingbot
index 6a1a7acf2..dffa59ad1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/editSetReferenceRefTable.modelingbot
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/editSetReferenceRefTable.modelingbot
@@ -26,11 +26,9 @@
         <propertiesEditionElement href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components#_Fx_LLQwvEd-uP4lw9e0IMw"/>

         <eContainingFeature xsi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//ReferencesTableSample/referencestableRequiredProperty"/>

       </processings>

-      <processings xsi:type="eef-mbot:Wizard" referenceableObject="//@sequences.0/@processings.5/@processings.0">

-        <processings xsi:type="eef-test_1:SetReference" name="required property" referenceableObject="//@sequences.0/@processings.5/@processings.0" values="//@sequences.0/@processings.5/@processings.2">

-          <propertiesEditionElement href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components#_Fx_LLQwvEd-uP4lw9e0IMw"/>

-          <eContainingFeature xsi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//ReferencesTableSample/referencestableRequiredProperty"/>

-        </processings>

+      <processings xsi:type="eef-test_1:SetReference" name="required property" referenceableObject="//@sequences.0/@processings.5/@processings.0" values="//@sequences.0/@processings.5/@processings.2">

+        <propertiesEditionElement href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components#_Fx_LLQwvEd-uP4lw9e0IMw"/>

+        <eContainingFeature xsi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//ReferencesTableSample/referencestableRequiredProperty"/>

       </processings>

       <processings xsi:type="eef-test:Save"/>

     </processings>

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/moveTableCompo.modelingbot b/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/moveTableCompo.modelingbot
index 8755a066a..3f256879a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/moveTableCompo.modelingbot
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/moveTableCompo.modelingbot
@@ -10,22 +10,20 @@
     <processings xsi:type="eef-test:OpenEditor" name="moveTableCompo" editorName="moveTableCompo/moveTableCompo.eefnr"/>

     <processings xsi:type="eef-test_1:Check"/>

     <processings xsi:type="eef-mbot:PropertiesView">

-      <processings xsi:type="eef-mbot:Wizard">

-        <processings xsi:type="eef-test_1:Add" name="sample of type Radio" referenceableObject="//@sequences.0/@processings.1">

-          <propertiesEditionElement href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components#_Fx_LAwwvEd-uP4lw9e0IMw"/>

-          <type href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//RadioSample"/>

-          <eContainingFeature xsi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//Root/samples"/>

-        </processings>

+      <processings xsi:type="eef-test_1:Add" name="sample of type Radio" referenceableObject="//@sequences.0/@processings.1">

+        <type href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//RadioSample"/>

+        <eContainingFeature xsi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//Root/samples"/>

       </processings>

-      <processings xsi:type="eef-mbot:Wizard">

-        <processings xsi:type="eef-test_1:Add" name="sample of type Radio 2" referenceableObject="//@sequences.0/@processings.1">

-          <propertiesEditionElement href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components#_Fx_LAwwvEd-uP4lw9e0IMw"/>

-          <type href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//RadioSample"/>

-          <eContainingFeature xsi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//Root/samples"/>

-        </processings>

+      <processings xsi:type="eef-test_1:Add" name="sample of type Radio 2" referenceableObject="//@sequences.0/@processings.1">

+        <type href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//RadioSample"/>

+        <eContainingFeature xsi:type="ecore:EReference" href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg/model/eefnr.ecore#//Root/samples"/>

+      </processings>

+      <processings xsi:type="eef-test_1:MoveUp" name="" referenceableObject="//@sequences.0/@processings.5/@processings.1">

+        <propertiesEditionElement href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components#_Fx_LAwwvEd-uP4lw9e0IMw"/>

+      </processings>

+      <processings xsi:type="eef-test_1:MoveDown" referenceableObject="//@sequences.0/@processings.5/@processings.1">

+        <propertiesEditionElement href="platform:/plugin/org.eclipse.emf.eef.tests.nonreg.edit/models/eefnr.components#_Fx_LAwwvEd-uP4lw9e0IMw"/>

       </processings>

-      <processings xsi:type="eef-test_1:MoveUp" name="" referenceableObject="//@sequences.0/@processings.5/@processings.1/@processings.0"/>

-      <processings xsi:type="eef-test_1:MoveDown" referenceableObject="//@sequences.0/@processings.5/@processings.1/@processings.0"/>

       <processings xsi:type="eef-test:Save"/>

     </processings>

     <processings xsi:type="eef-test_1:Check"/>

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-mbot/org/eclipse/emf/eef/tests/nonreg/AllTests.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-mbot/org/eclipse/emf/eef/tests/nonreg/AllTests.java
index dd05f88a6..949ebb2ce 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-mbot/org/eclipse/emf/eef/tests/nonreg/AllTests.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-mbot/org/eclipse/emf/eef/tests/nonreg/AllTests.java
@@ -55,7 +55,6 @@ import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotSetReferenceRefT
 import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotUndoAddTableComposition;
 import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotUndoSetAttributeRadio;
 import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotUndoSetReferenceAEOFCV;
-import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotUndoSetReferenceCombo;
 import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotUndoSetReferenceFlatRefTable;
 import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotUndoSetReferenceRefTable;
 import org.eclipse.emf.eef.tests.nonreg.propertiesView.PViewMBotUnsetAEOFCV;
@@ -126,7 +125,6 @@ public class AllTests extends TestCase {
 		suite.addTestSuite(PViewMBotUndoAddTableComposition.class);
 		suite.addTestSuite(PViewMBotUndoSetAttributeRadio.class);
 		suite.addTestSuite(PViewMBotUndoSetReferenceAEOFCV.class);
-		suite.addTestSuite(PViewMBotUndoSetReferenceCombo.class);
 		suite.addTestSuite(PViewMBotUndoSetReferenceFlatRefTable.class);
 		suite.addTestSuite(PViewMBotUndoSetReferenceRefTable.class);
 		suite.addTestSuite(PViewMBotUnsetAEOFCV.class);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-mbot/org/eclipse/emf/eef/tests/nonreg/propertiesView/PViewMBotUndoSetReferenceCombo.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-mbot/org/eclipse/emf/eef/tests/nonreg/propertiesView/PViewMBotUndoSetReferenceCombo.java
deleted file mode 100644
index c5ddcca89..000000000
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-mbot/org/eclipse/emf/eef/tests/nonreg/propertiesView/PViewMBotUndoSetReferenceCombo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2011, 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.eef.tests.nonreg.propertiesView;

-

-/**

- * @author <a href="mailto:riadh.hajamor@obeo.fr">Riadh HAJ AMOR</a>

- */

-public class PViewMBotUndoSetReferenceCombo extends org.eclipse.emf.eef.modelingBot.testcase.AbstractComposedModelingBotTestCase {

-

-	public void testModelingBot() throws Exception {

-		bot.runModelingBot("org.eclipse.emf.eef.tests.nonreg.junit/models/propertiesView_nonreg/undoSetReferenceCombo.modelingbot");

-	}

-

-}