diff options
author | Quentin Le Menez | 2015-04-29 09:25:03 +0000 |
---|---|---|
committer | Camille Letavernier | 2015-04-29 12:44:53 +0000 |
commit | 70d00d8e910abeb1692810799f845f4c0af97f91 (patch) | |
tree | a741d7f347b11c029f29472d4bd614282ea63019 | |
parent | 5175ebff02ca6261d791dfd9c42f9cc81df0b3b3 (diff) | |
download | org.eclipse.papyrus-70d00d8e910abeb1692810799f845f4c0af97f91.tar.gz org.eclipse.papyrus-70d00d8e910abeb1692810799f845f4c0af97f91.tar.xz org.eclipse.papyrus-70d00d8e910abeb1692810799f845f4c0af97f91.zip |
Bug 465773: [TESTS] Fix tests of the new Model/Project Wizards
https://bugs.eclipse.org/bugs/show_bug.cgi?id=465773
- Fix the tests for the new wizards
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Change-Id: Icdf24c7141c4fb0ca42f528d48e67787aa3ac820
Reviewed-on: https://git.eclipse.org/r/46768
Tested-by: Hudson CI
Reviewed-by: Camille Letavernier <camille.letavernier@cea.fr>
8 files changed, 55 insertions, 42 deletions
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java index 25a3d9ebc73..1f347a30052 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/AllTests.java @@ -19,8 +19,8 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class)
@SuiteClasses({
-// {oep}.uml.diagram.wizards
-TestCreateModelWizard.class, TestCreateSysMLModelWizard.class, TestInitModelWizard.class, TestNewProjectWizard.class, TestNewSysMLProjectWizard.class, TestCreateModelFromExistingModelWizard.class })
+ // {oep}.uml.diagram.wizards
+ TestCreateModelWizard.class, TestCreateSysMLModelWizard.class, TestInitModelWizard.class, TestNewProjectWizard.class, TestNewSysMLProjectWizard.class, TestCreateModelFromExistingModelWizard.class })
/**
* Suite Class for all tests in the plugin
*/
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 04f2405f8c7..d93e62c7ded 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 @@ -24,18 +24,16 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
import org.eclipse.papyrus.junit.utils.ProjectUtils;
-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage;
import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWizard;
import org.junit.Assert;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
@@ -101,11 +99,12 @@ public class TestCreateModelFromExistingModelWizard extends TestNewModelWizardBa }
- @Ignore
+
@Test
public void testOrderOfPages() {
- Class<?>[] expectedPages = new Class[] { SelectStorageProviderPage.class, SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class };
- // Class<?>[] expectedPages = new Class[]{ NewModelFilePage.class, SelectDiagramCategoryPage.class, SelectDiagramKindPage.class, SelectRootElementPage.class };
+ // 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, };
IWorkbenchWizard wizard = initWizardDialog();
testOrderOfPages(wizard, expectedPages);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java index bd858a8ba62..c23772ae929 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java @@ -19,10 +19,8 @@ import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand; import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage; import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage; import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; -import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage; import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard; import org.eclipse.ui.IWorkbenchWizard; -import org.junit.Ignore; import org.junit.Test; @@ -40,11 +38,11 @@ public class TestCreateModelWizard extends TestNewModelWizardBase { }; } - @Ignore @Test public void testOrderOfPages() { - Class<?>[] expectedPages = new Class[] { SelectStorageProviderPage.class, SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class }; - // Class<?>[] expectedPages = new Class[] { NewModelFilePage.class, SelectDiagramCategoryPage.class, SelectDiagramKindPage.class, }; + // actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, SelectStorageProvider -> SelectStorageProviderPage, + // NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage] + Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, }; IWorkbenchWizard wizard = initWizardDialog(); testOrderOfPages(wizard, expectedPages); @@ -72,7 +70,7 @@ public class TestCreateModelWizard extends TestNewModelWizardBase { assertEquals(expectedExtension, page.getFileExtension()); } - // This test isnt revelent + // @Test public void testDiagramFileExtenstionForProfile() { final String expectedExtension = "profile.di"; InitModelWizard wizard = new InitModelWizard() { @@ -90,12 +88,10 @@ public class TestCreateModelWizard extends TestNewModelWizardBase { }; // ensure that the dialog would create a profile - // settings.saveDefaultDiagramCategory(new String[]{ "profile" }); + settings.saveDefaultDiagramCategory(new String[] { "profile" }); initWizardDialog(wizard); NewModelFilePage page = getPage(wizard, NewModelFilePage.class); - // we force the validation of the category page to change the name of the file - getPage(wizard, SelectDiagramCategoryPage.class).canFlipToNextPage(); assertEquals(expectedExtension, page.getFileExtension()); } 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 26f93ca8e4f..e94b237fb3a 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; @@ -32,7 +33,9 @@ public class TestCreateSysMLModelWizard extends TestNewModelWizardBase { @Test public void testOrderOfPages() { - Class<?>[] expectedPages = new Class[]{ NewModelFilePage.class, SelectDiagramKindPage.class, }; + // actual pages: [SelectStorageProvider -> SelectStorageProviderPage, + // NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage] + Class<?>[] expectedPages = new Class[] { SelectStorageProviderPage.class, NewModelFilePage.class, SelectDiagramKindPage.class }; IWorkbenchWizard wizard = initWizardDialog(); testOrderOfPages(wizard, expectedPages); @@ -62,7 +65,7 @@ public class TestCreateSysMLModelWizard extends TestNewModelWizardBase { @Override protected String[] getDiagramCategoryIds() { - return new String[]{ CreateSysMLModelCommand.COMMAND_ID }; + return new String[] { CreateSysMLModelCommand.COMMAND_ID }; } }; 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 ea85bec118c..ab37a5f035c 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 @@ -19,11 +19,9 @@ import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand; import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage; import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage; import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; -//import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage; -import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage; +import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage; import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard; import org.eclipse.ui.IWorkbenchWizard; -import org.junit.Ignore; import org.junit.Test; @@ -76,11 +74,11 @@ public class TestInitModelWizard extends TestNewModelWizardBase { assertEquals(expectedExtension, page.getFileExtension()); } - @Ignore @Test public void testOrderOfPages() { - Class<?>[] expectedPages = new Class[] { SelectStorageProviderPage.class, SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class }; - // Class<?>[] expectedPages = new Class[]{ NewModelFilePage.class, SelectDiagramCategoryPage.class, SelectDiagramKindPage.class, SelectRootElementPage.class, }; + // 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, }; IWorkbenchWizard wizard = initWizardDialog(); testOrderOfPages(wizard, expectedPages); @@ -111,7 +109,7 @@ public class TestInitModelWizard extends TestNewModelWizardBase { }; // ensure that the dialog would create a profile - // settings.saveDefaultDiagramCategory(new String[]{ "profile" }); + settings.saveDefaultDiagramCategory(new String[] { "profile" }); initWizardDialog(wizard); NewModelFilePage page = getPage(wizard, NewModelFilePage.class); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewModelWizardBase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewModelWizardBase.java index b4b5a2c3d48..efa9c17ba03 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewModelWizardBase.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewModelWizardBase.java @@ -33,7 +33,7 @@ import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest; -import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectStorageProviderPage; +import org.eclipse.papyrus.uml.diagram.wizards.utils.SettingsHelper; import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -50,6 +50,8 @@ public abstract class TestNewModelWizardBase extends AbstractPapyrusTest { protected static final IStructuredSelection EMPTY_SELECTION = StructuredSelection.EMPTY; + protected SettingsHelper settings; + protected abstract IWorkbenchWizard createWizard(); private String settingsBackup; @@ -105,20 +107,32 @@ public abstract class TestNewModelWizardBase extends AbstractPapyrusTest { } protected void testOrderOfPages(IWorkbenchWizard wizard, Class<?>[] expectedPages) { - Class<?> optionalInitialPage = SelectStorageProviderPage.class; + // Class<?> optionalInitialPage = SelectStorageProviderPage.class; + // + // IWizardPage next = wizard.getPages()[0]; + // for (int i = 0; i < expectedPages.length; i++) { + // String isNullMessageFormat = "page %s expected, but actual is: null"; + // assertNotNull(String.format(isNullMessageFormat, i), next); + // + // if ((optionalInitialPage != null) && (i == 0) && optionalInitialPage.isInstance(next)) { + // // we have tested the optional initial page; don't do it again + // optionalInitialPage = null; + // i--; + // } else { + // testPageInstanceOf(next, expectedPages[i], i); + // } + // + // next = next.getNextPage(); + // } + // String noMorePagesExpectedMessageFormat = "page %s is not expected"; + // assertNull(String.format(noMorePagesExpectedMessageFormat, next), next); IWizardPage next = wizard.getPages()[0]; for (int i = 0; i < expectedPages.length; i++) { String isNullMessageFormat = "page %s expected, but actual is: null"; assertNotNull(String.format(isNullMessageFormat, i), next); - if ((optionalInitialPage != null) && (i == 0) && optionalInitialPage.isInstance(next)) { - // we have tested the optional initial page; don't do it again - optionalInitialPage = null; - i--; - } else { - testPageInstanceOf(next, expectedPages[i], i); - } + testPageInstanceOf(next, expectedPages[i], i); next = next.getNextPage(); } @@ -138,6 +152,7 @@ public abstract class TestNewModelWizardBase extends AbstractPapyrusTest { if (settings == null) { settings = workbenchSettings.addNewSection(CreateModelWizard.NEW_MODEL_SETTINGS); } + this.settings = new SettingsHelper(settings); StringWriter backupWriter = new StringWriter(); try { diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java index d37ed5c71b9..6effb053757 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java @@ -1,6 +1,6 @@ /***************************************************************************** * Copyright (c) 2013, 2014 LIFL, CEA LIST, and others. - * + * * 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 @@ -9,15 +9,15 @@ * Contributors: * LIFL - Initial API and implementation * CEA LIST - Update tests and re-integrate into automation suite - * + * *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.wizards; +import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage; import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage; import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard; import org.eclipse.ui.IWorkbenchWizard; -import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; import org.junit.Test; @@ -32,7 +32,8 @@ public class TestNewProjectWizard extends TestNewModelWizardBase { @Test public void testOrderOfPages() { - Class<?>[] expectedPages = new Class[]{ WizardNewProjectCreationPage.class, SelectDiagramCategoryPage.class, SelectDiagramKindPage.class, }; + // actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, PapyrusNewProjectPage -> PapyrusProjectCreationPage, SelectDiagramKind -> SelectDiagramKindPage] + Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, PapyrusProjectCreationPage.class, SelectDiagramKindPage.class, }; IWorkbenchWizard wizard = initWizardDialog(); testOrderOfPages(wizard, expectedPages); diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java index 9cd62333bd1..76bd8db1cc0 100644 --- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java +++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewSysMLProjectWizard.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertEquals; import org.eclipse.papyrus.sysml.diagram.common.commands.CreateSysMLModelCommand; import org.eclipse.papyrus.sysml.diagram.ui.NewSysMLProjectWizard; +import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage; import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage; import org.eclipse.ui.IWorkbenchWizard; -import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; import org.junit.Test; @@ -22,7 +22,8 @@ public class TestNewSysMLProjectWizard extends TestNewModelWizardBase { @Test public void testOrderOfPages() { - Class<?>[] expectedPages = new Class[]{ WizardNewProjectCreationPage.class, SelectDiagramKindPage.class, }; + // actual pages: [PapyrusNewProjectPage -> PapyrusProjectCreationPage, SelectDiagramKind -> SelectDiagramKindPage] + Class<?>[] expectedPages = new Class[] { PapyrusProjectCreationPage.class, SelectDiagramKindPage.class }; IWorkbenchWizard wizard = initWizardDialog(); testOrderOfPages(wizard, expectedPages); @@ -36,7 +37,7 @@ public class TestNewSysMLProjectWizard extends TestNewModelWizardBase { // open access to protected method @Override public String[] getDiagramCategoryIds() { - return new String[]{ CreateSysMLModelCommand.COMMAND_ID }; + return new String[] { CreateSysMLModelCommand.COMMAND_ID }; } } |