Bug 469830: [Test] Mars Regression - Do not rename selected/named profile package to RootElement on profile model creation

https://bugs.eclipse.org/bugs/show_bug.cgi?id=469830

- amended the tests for the new behavior

Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Change-Id: I303b914028dd3ed8f774e78aad7dac299b496605
Reviewed-on: https://git.eclipse.org/r/49933
Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
Tested-by: Camille Letavernier <camille.letavernier@cea.fr>

3 files changed, 6 insertions, 4 deletions

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java
index d93e62c7ded..7ad0d8d0007 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java
@@ -104,7 +104,7 @@ public class TestCreateModelFromExistingModelWizard extends TestNewModelWizardBa
 	public void testOrderOfPages() {

 		// actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, SelectStorageProvider -> SelectStorageProviderPage,

 		// NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage, SelectRootPage -> SelectRootElementPage]

-		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, SelectRootElementPage.class, };

+		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, /* SelectRootElementPage.class, */ };

 

 		IWorkbenchWizard wizard = initWizardDialog();

 		testOrderOfPages(wizard, expectedPages);

@@ -116,14 +116,14 @@ public class TestCreateModelFromExistingModelWizard extends TestNewModelWizardBa
 

 			private boolean isInitFromExistingDomainModel;

 

-			private SelectRootElementPage selectRootElementPage;

+			// private SelectRootElementPage selectRootElementPage;

 

 			@Override

 			public void init(IWorkbench workbench, IStructuredSelection selection) {

 				URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

 				isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);

 				super.init(workbench, selection);

-				selectRootElementPage = createSelectRootElementPage(selection);

+				// selectRootElementPage = createSelectRootElementPage(selection);

 				if (isCreateFromExistingDomainModel()) {

 					// Init Model not Create a new one

 					setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java
index 21e39fa6200..deb9f515bb9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateSysMLModelWizard.java
@@ -19,6 +19,7 @@ import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand
 import org.eclipse.papyrus.sysml.diagram.ui.NewSysMLModelWizard;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage;
 import org.eclipse.ui.IWorkbenchWizard;
 import org.junit.Test;
 
@@ -34,6 +35,7 @@ public class TestCreateSysMLModelWizard extends TestNewModelWizardBase {
 	public void testOrderOfPages() {
 		// actual pages: [SelectStorageProvider -> SelectStorageProviderPage,
 		// NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage]
+		// Class<?>[] expectedPages = new Class[] { SelectStorageProviderPage.class, NewModelFilePage.class, SelectDiagramKindPage.class };
 		Class<?>[] expectedPages = new Class[] { NewModelFilePage.class, SelectDiagramKindPage.class };
 
 		IWorkbenchWizard wizard = initWizardDialog();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
index ab37a5f035c..9f785501da6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
@@ -78,7 +78,7 @@ public class TestInitModelWizard extends TestNewModelWizardBase {
 	public void testOrderOfPages() {
 		// actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, SelectStorageProvider -> SelectStorageProviderPage,
 		// NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage, SelectRootPage -> SelectRootElementPage]
-		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, SelectRootElementPage.class, };
+		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, /* SelectRootElementPage.class, */ };
 
 		IWorkbenchWizard wizard = initWizardDialog();
 		testOrderOfPages(wizard, expectedPages);