429239: [Resource Management] Refactoring of the 3-files model and

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

- Fix tests to match the refactoring

3 files changed, 82 insertions, 87 deletions

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
index bbe4bf7e3b5..3d33ff5fe0b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
@@ -1,6 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2013 CEA LIST.

- * 

+ *

  * 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

@@ -60,9 +60,9 @@ import org.junit.Test;
 /**

  * Tests the basic PageManager cases, integrated with the CoreMultiDiagramEditor

  * and a few UML Diagrams/Tables

- * 

+ *

  * @author Camille Letavernier

- * 

+ *

  */

 public class PageManagerTests extends AbstractEditorIntegrationTest {

 

@@ -234,44 +234,44 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 	@Test

 	@Ignore("new papyrus table are not yet in the main build")

 	public void testAvailableAndActivePageWithNatTable() throws Exception {

-//		initModel("availableAndActivePage2", "two_tables_model");

-//		IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);

-//		Assert.assertEquals(2, pageManager.allPages().size());

-//		IEditorPart tableEditor = editor.getActiveEditor();

-//		Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method

-//		INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

-//		Assert.assertNotNull(manager);

-//		Assert.assertEquals("PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());

-//

-//		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();

-//

-//		Table genericTable = (Table)notationResource.getContents().get(0);

-//		Table tableOfViews = (Table)notationResource.getContents().get(1);

-//

-//		TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);

-//		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, tableOfViews)));

-//		tableEditor = editor.getActiveEditor();

-//		Assert.assertTrue(tableEditor instanceof NatTableEditor);

-//		manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

-//		Assert.assertNotNull(manager);

-//		Assert.assertEquals("PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());

-//

-//		//FIXME: Does not work yet. See Bug 401107: [IPageManager] selectPage does not work

-//		//TODO: There should be a specific test for selectPage, with a basic and a complex model

-//		pageManager.selectPage(genericTable);

-//		tableEditor = editor.getActiveEditor();

-//		Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method

-//		manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

-//		Assert.assertNotNull(manager);

-//		Assert.assertEquals("Couldn't change the page selection", "PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());

-//

-//

-//		pageManager.selectPage(tableOfViews);

-//		tableEditor = editor.getActiveEditor();

-//		Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method

-//		manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

-//		Assert.assertNotNull(manager);

-//		Assert.assertEquals("Couldn't change the page selection", "PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());

+		//		initModel("availableAndActivePage2", "two_tables_model");

+		//		IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);

+		//		Assert.assertEquals(2, pageManager.allPages().size());

+		//		IEditorPart tableEditor = editor.getActiveEditor();

+		//		Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method

+		//		INattableModelManager manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

+		//		Assert.assertNotNull(manager);

+		//		Assert.assertEquals("PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());

+		//

+		//		Resource notationResource = NotationUtils.getNotationModel(editor.getServicesRegistry().getService(ModelSet.class)).getResource();

+		//

+		//		Table genericTable = (Table)notationResource.getContents().get(0);

+		//		Table tableOfViews = (Table)notationResource.getContents().get(1);

+		//

+		//		TransactionalEditingDomain editingDomain = editor.getServicesRegistry().getService(TransactionalEditingDomain.class);

+		//		editingDomain.getCommandStack().execute(new GMFtoEMFCommandWrapper(new OpenDiagramCommand(editingDomain, tableOfViews)));

+		//		tableEditor = editor.getActiveEditor();

+		//		Assert.assertTrue(tableEditor instanceof NatTableEditor);

+		//		manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

+		//		Assert.assertNotNull(manager);

+		//		Assert.assertEquals("PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());

+		//

+		//		//FIXME: Does not work yet. See Bug 401107: [IPageManager] selectPage does not work

+		//		//TODO: There should be a specific test for selectPage, with a basic and a complex model

+		//		pageManager.selectPage(genericTable);

+		//		tableEditor = editor.getActiveEditor();

+		//		Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method

+		//		manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

+		//		Assert.assertNotNull(manager);

+		//		Assert.assertEquals("Couldn't change the page selection", "PapyrusGenericTable", manager.getTable().getTableConfiguration().getType());

+		//

+		//

+		//		pageManager.selectPage(tableOfViews);

+		//		tableEditor = editor.getActiveEditor();

+		//		Assert.assertTrue(tableEditor instanceof NatTableEditor); //TODO: The PageManager doesn't provide the getActivePage() method

+		//		manager = (INattableModelManager)tableEditor.getAdapter(INattableModelManager.class);

+		//		Assert.assertNotNull(manager);

+		//		Assert.assertEquals("Couldn't change the page selection", "PapyrusViewsTable", manager.getTable().getTableConfiguration().getType());

 	}

 

 	@Test

@@ -297,7 +297,7 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 		final Diagram diagram = (Diagram)NotationUtils.getNotationModel(modelSet).getResource().getContents().get(0);

 		testPageDeletion(diagram, UmlClassDiagramForMultiEditor.class);

 	}

-	

+

 	/**

 	 * @author vincent lorenzo

 	 * @throws Exception

@@ -305,15 +305,15 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 	@Test

 	@Ignore("new papyrus table are not yet in the main build")

 	public void testNatTableDeletion() throws Exception {

-//		initModel("tableDeletion", "simple_uml_generic_table_model");

-//		ModelSet modelSet = getModelSet();

-//		final Table diagram = (Table)NotationUtils.getNotationModel(modelSet).getResource().getContents().get(0);

-//		testPageDeletion(diagram, NatTableEditor.class);

+		//		initModel("tableDeletion", "simple_uml_generic_table_model");

+		//		ModelSet modelSet = getModelSet();

+		//		final Table diagram = (Table)NotationUtils.getNotationModel(modelSet).getResource().getContents().get(0);

+		//		testPageDeletion(diagram, NatTableEditor.class);

 	}

 

 	//Does not work. The table creation produces two executable commands (Create Table Editor and Identity)

 	//Only Identity (which does nothing) is undoable. Undoing the table creation does nothing

-	//This is an EMF Facet Table bug, which tries to delete columns for an empty table as soon as the table is created 

+	//This is an EMF Facet Table bug, which tries to delete columns for an empty table as soon as the table is created

 	@Test

 	public void testTableCreation() throws Exception {

 		initModel("tableCreation", "empty_model", getBundle());

@@ -324,7 +324,7 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 

 		final EObject tableContext = UmlUtils.getUmlModel(modelSet).getResource().getContents().get(0);

 

-		

+

 	}

 

 

@@ -452,7 +452,7 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 		TransactionalEditingDomain editingDomain = getTransactionalEditingDomain();

 

 		final int initialSize = pageManager.allPages().size();

-		Model model = (Model)UmlUtils.getUmlModel(modelSet).getResource().getContents().get(0);

+		Model model = (Model)UmlUtils.getUmlModel(modelSet).lookupRoot();

 

 		IElementEditService provider;

 

@@ -491,7 +491,7 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 

 		Assert.assertTrue("All remaining pages should have been destroyed", pageManager.allPages().isEmpty());

 	}

-	

+

 	@Ignore("Unsupported yet")

 	@Test

 	public void testContainedTableDeletion() throws Exception {

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java
index aa6930a132a..43a1f662ad1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/DiContentProviderTest.java
@@ -3,8 +3,6 @@ package org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal;
 import java.util.ArrayList;

 import java.util.List;

 

-import junit.framework.TestCase;

-

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IAbstractPanelModel;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IContentChangedListener;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel;

@@ -16,15 +14,18 @@ import org.eclipse.papyrus.infra.core.sashwindows.di.SashModel;
 import org.eclipse.papyrus.infra.core.sashwindows.di.TabFolder;

 import org.eclipse.papyrus.infra.core.sashwindows.di.util.DiUtils;

 import org.eclipse.swt.SWT;

+import org.junit.After;

+import org.junit.Assert;

 import org.junit.Before;

 import org.junit.Ignore;

+import org.junit.Test;

 

 

 /**

  *

  * @author cedric dumoulin

  */

-public class DiContentProviderTest extends TestCase {

+public class DiContentProviderTest {

 

 	/**

 	 * The {@link DiContentProvider} under test.

@@ -34,23 +35,8 @@ public class DiContentProviderTest extends TestCase {
 	/** The FolderModel of the first TabFolder */

 	protected ITabFolderModel folderModel;

 

-	/**

-	 * Constructor.

-	 *

-	 * @param name

-	 */

-	public DiContentProviderTest(String name) {

-		super(name);

-	}

-

-	/*

-	 *

-	 */

 	@Before

-	@Override

-	protected void setUp() throws Exception {

-		super.setUp();

-

+	public void setUp() throws Exception {

 		IPageModelFactory pageModelFactory = new FakePageModelFactory();

 		SashModel diSashModel = DiUtils.createDefaultSashModel();

 		contentProvider = new DiContentProvider(diSashModel, pageModelFactory);

@@ -63,9 +49,9 @@ public class DiContentProviderTest extends TestCase {
 	 *

 	 * @throws Exception

 	 */

-	@Override

-	protected void tearDown() throws Exception {

-		super.tearDown();

+	@After

+	public void tearDown() throws Exception {

+

 	}

 

 	/**

@@ -115,6 +101,7 @@ public class DiContentProviderTest extends TestCase {
 	 * Test a typical life cycle on contentProvider:

 	 * creation, add change listener, add pages, move page

 	 */

+	@Test

 	public void testLifeCycle() {

 

 		// A listener on change event.

@@ -136,14 +123,14 @@ public class DiContentProviderTest extends TestCase {
 			contentProvider.addPage(id);

 

 			// Check fired events

-			assertEquals("One event fired", 1, changeListener.getChangeCount());

+			Assert.assertEquals("One event fired", 1, changeListener.getChangeCount());

 		}

 

 		// Test moving a page

 		changeListener.reset();

 		contentProvider.movePage(folderModel, 3, 8);

 		// Check fired events

-		assertEquals("One event fired", 1, changeListener.getChangeCount());

+		Assert.assertEquals("One event fired", 1, changeListener.getChangeCount());

 

 	}

 

@@ -153,15 +140,17 @@ public class DiContentProviderTest extends TestCase {
 	 * Test type of the root model.

 	 * Actually, it should be subtype of AbstractPanel {@link DiContentProvider#getRootModel()}

 	 */

+	@Test

 	public void testGetRootModel() {

 

-		assertTrue("subtype of AbstractPanel", AbstractPanel.class.isInstance(contentProvider.getRootModel()));

+		Assert.assertTrue("subtype of AbstractPanel", AbstractPanel.class.isInstance(contentProvider.getRootModel()));

 	}

 

 

 	/**

 	 * Test {@link DiContentProvider#createFolder(ITabFolderModel, int, ITabFolderModel, int)}

 	 */

+	@Test

 	public void testCreateFolder() {

 

 		// A listener on change event.

@@ -186,30 +175,29 @@ public class DiContentProviderTest extends TestCase {
 		changeListener.reset();

 		// create a folder

 		contentProvider.createFolder(folderModel, 3, folderModel, SWT.RIGHT);

-		assertEquals("One event fired", 1, changeListener.getChangeCount());

+		Assert.assertEquals("One event fired", 1, changeListener.getChangeCount());

 

 		// Check if pageIdentifier 3 have change of folder

 		PageRef pageRef = contentProvider.getDiSashModel().lookupPage(identifiers.get(3));

-		assertNotNull("Moved page have a parent", pageRef.getParent());

-		assertNotSame("Moved page is in another parent", ((TabFolderModel)folderModel).getTabFolder(), pageRef.getParent());

+		Assert.assertNotNull("Moved page have a parent", pageRef.getParent());

+		Assert.assertNotSame("Moved page is in another parent", ((TabFolderModel)folderModel).getTabFolder(), pageRef.getParent());

 

 		// reset change count

 		changeListener.reset();

 		// Test creating a third folder

 		contentProvider.createFolder(folderModel, 2, folderModel, SWT.UP);

-		assertEquals("One event fired", 1, changeListener.getChangeCount());

+		Assert.assertEquals("One event fired", 1, changeListener.getChangeCount());

 		// Check if pageIdentifier 2 have change of folder

 		pageRef = contentProvider.getDiSashModel().lookupPage(identifiers.get(2));

-		assertNotNull("Moved page have a parent", pageRef.getParent());

-		assertNotSame("Moved page is in another parent", ((TabFolderModel)folderModel).getTabFolder(), pageRef.getParent());

-

-

+		Assert.assertNotNull("Moved page have a parent", pageRef.getParent());

+		Assert.assertNotSame("Moved page is in another parent", ((TabFolderModel)folderModel).getTabFolder(), pageRef.getParent());

 	}

 

 	/**

 	 * Check if {@link DiContentProvider#setCurrentFolder(Object)}.

 	 * Check if the method works and DO NO send any event.

 	 */

+	@Test

 	@Ignore("This test is currently deprecated; current folder cannot be set programmatically")

 	public void testSetCurrentFolder() {

 		// A listener on change event.

@@ -234,7 +222,7 @@ public class DiContentProviderTest extends TestCase {
 		changeListener.reset();

 		// create a folder

 		contentProvider.createFolder(folderModel, 3, folderModel, SWT.RIGHT);

-		assertEquals("One event fired", 1, changeListener.getChangeCount());

+		Assert.assertEquals("One event fired", 1, changeListener.getChangeCount());

 

 

 		// Get the real di implementation of the first folder

@@ -242,15 +230,15 @@ public class DiContentProviderTest extends TestCase {
 		TabFolder createdDiFolder = contentProvider.getDiSashModel().getCurrentSelection();

 

 		// Check if the folder has changed

-		assertNotSame("current folder has change", firstFolder, createdDiFolder);

+		Assert.assertNotSame("current folder has change", firstFolder, createdDiFolder);

 		// Get the created folder

 

 		// Try to change the current selection by setting the first folder again

 		changeListener.reset();

 		contentProvider.setCurrentFolder(firstFolder);

 		// Check if really changed

-		assertEquals("current folder set correctly", firstFolder, contentProvider.getDiSashModel().getCurrentSelection());

-		assertEquals("No event fired", 0, changeListener.getChangeCount());

+		Assert.assertEquals("current folder set correctly", firstFolder, contentProvider.getDiSashModel().getCurrentSelection());

+		Assert.assertEquals("No event fired", 0, changeListener.getChangeCount());

 	}

 

 

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java
index 9b5481b7c00..cbc22819782 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.di.tests/test/org/eclipse/papyrus/infra/core/sasheditor/di/contentprovider/internal/PageMngrImplTest.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ISashPanelModel
 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.ITabFolderModel;

 import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IPageModelFactory;

 import org.eclipse.papyrus.infra.core.sashwindows.di.AbstractPanel;

+import org.eclipse.papyrus.infra.core.sashwindows.di.DiFactory;

 import org.eclipse.papyrus.infra.core.sashwindows.di.PageRef;

 import org.eclipse.papyrus.infra.core.sashwindows.di.SashWindowsMngr;

 import org.eclipse.papyrus.infra.core.sashwindows.di.impl.TabFolderImpl;

@@ -68,6 +69,12 @@ public class PageMngrImplTest extends TestCase {
 		super.setUp();

 

 		SashWindowsMngr diSashModel = DiUtils.createDefaultSashWindowsMngr();

+

+		//Fix bug to match refactoring in Bug 429239. The current implementation computes allPages() dynamically,

+		//and doesn't support addPage() and removePage() anymore

+		//Because this test is used in a different context, where allPages() cannot be computed dynamically,

+		//we need to create a specific setup

+		diSashModel.setPageList(DiFactory.eINSTANCE.createPageList());

 		ContentChangedEventProvider eventProvider = new ContentChangedEventProvider(diSashModel);

 		pageMngr = new PageMngrImpl(diSashModel, eventProvider);