test refactoring

Change-Id: I6c0d599941c7829765b53be0c5a2077c8e03e1e4

tests/org.eclipse.emf.parsley.tests/EmfParsleyAllTests.launch

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfParsleyAllTests.java"/>
+<listEntry value="/org.eclipse.emf.parsley.tests/xtend-gen/org/eclipse/emf/parsley/tests"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="2"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.emf.parsley.tests/xtend-gen&lt;org.eclipse.emf.parsley.tests"/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.parsley.tests.EmfParsleyAllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.parsley.tests"/>
 </launchConfiguration>

tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractTreeViewerTest.xtend → tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractViewerTest.xtend

@@ -10,47 +10,59 @@
  *******************************************************************************/
 package org.eclipse.emf.parsley.tests
 
+import com.google.inject.Injector
+import java.util.List
 import org.eclipse.emf.ecore.EClass
+import org.eclipse.emf.ecore.EStructuralFeature
 import org.eclipse.emf.parsley.viewers.ViewerFactory
+import org.eclipse.jface.viewers.TableViewer
 import org.eclipse.jface.viewers.TreeViewer
 import org.eclipse.swt.SWT
 import org.junit.Before
-import com.google.inject.Injector
-import org.eclipse.emf.ecore.EStructuralFeature
-import java.util.List
 
-abstract class AbstractTreeViewerTest extends AbstractImageBasedTest {
+abstract class AbstractViewerTest extends AbstractImageBasedTest {
 
 	var protected ViewerFactory viewerFactory
 
 	var protected TreeViewer treeViewer
 
+	var protected TableViewer tableViewer
+
 	val protected numOfElements = 10
 
 	@Before
 	def void setupViewerStuff() {
 		treeViewer = createTreeViewer
+		tableViewer = createTableViewer
 		createContents
 	}
 
-	def protected buildAndFill(Object contents, EClass eClass) {
-		buildAndFill(getOrCreateInjector, contents, eClass)
+	def protected buildAndFillTreeViewer(Object contents, EClass eClass) {
+		buildAndFillTreeViewer(getOrCreateInjector, contents, eClass)
 	}
 
-	def protected buildAndFill(Injector injector, Object contents, EClass eClass) {
-		viewerFactory = injector.getInstance(ViewerFactory)
+	def protected buildAndFillTreeViewer(Injector injector, Object contents, EClass eClass) {
+		createViewerFactory(injector)
 		syncExecVoid[
 			viewerFactory.buildColumns(treeViewer, eClass)
 			viewerFactory.initialize(treeViewer, contents)
 		]
 	}
 
-	def protected buildAndFillWithFeatures(List<EStructuralFeature> features, Object contents) {
-		buildAndFillWithFeatures(getOrCreateInjector, features, contents)
+	protected def createViewerFactory() {
+		createViewerFactory(getOrCreateInjector)
 	}
 
-	def protected buildAndFillWithFeatures(Injector injector, List<EStructuralFeature> features, Object contents) {
+	protected def createViewerFactory(Injector injector) {
 		viewerFactory = injector.getInstance(ViewerFactory)
+	}
+
+	def protected buildAndFillTreeViewerWithFeatures(List<EStructuralFeature> features, Object contents) {
+		buildAndFillTreeViewerWithFeatures(getOrCreateInjector, features, contents)
+	}
+
+	def protected buildAndFillTreeViewerWithFeatures(Injector injector, List<EStructuralFeature> features, Object contents) {
+		createViewerFactory(injector)
 		syncExecVoid[
 			viewerFactory.buildColumns(treeViewer, features)
 			viewerFactory.initialize(treeViewer, contents)
@@ -64,6 +76,25 @@ abstract class AbstractTreeViewerTest extends AbstractImageBasedTest {
 		]
 	}
 
+	def protected buildAndFillTableViewer(Object contents, EClass eClass) {
+		buildAndFillTableViewer(getOrCreateInjector, contents, eClass)
+	}
+
+	def protected buildAndFillTableViewer(Injector injector, Object contents, EClass eClass) {
+		viewerFactory = injector.getInstance(ViewerFactory)
+		syncExecVoid[
+			viewerFactory.buildColumns(tableViewer, eClass)
+			tableViewer.input = contents
+		]
+	}
+
+	def protected createTableViewer() {
+		syncExec[
+			new TableViewer(shell,
+				SWT.MULTI.bitwiseOr(SWT.H_SCROLL).bitwiseOr(SWT.V_SCROLL).bitwiseOr(SWT.FULL_SELECTION))
+		]
+	}
+
 	def protected createContents() {
 		for (i : 0 ..< numOfElements) {
 			testContainer.classesWithName += createClassWithName("name " + i)

tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingMenuBuilderTest.xtend

@@ -1,5 +1,7 @@
 package org.eclipse.emf.parsley.tests
 
+import org.eclipse.emf.parsley.tests.scenarios.EditingMenuBuilderTestWithEditingDomainRetrievedScenario
+import org.eclipse.emf.parsley.tests.scenarios.EditingMenuBuilderTestWithEditingDomainSetScenario
 import org.junit.runner.RunWith
 import org.junit.runners.Suite
 

tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeatureNamePathTest.java → tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeatureNamePathTest.xtend

@@ -1,25 +1,20 @@
-/*******************************************************************************
+/** 
  * Copyright (c) 2013 RCP Vision (http://www.rcp-vision.com) 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
  * http://www.eclipse.org/legal/epl-v10.html
- * 
  * Contributors:
  * Lorenzo Bettini - Initial contribution and API
- *******************************************************************************/
-package org.eclipse.emf.parsley.tests;
+ */
+package org.eclipse.emf.parsley.tests
 
-import org.junit.Test;
+import org.junit.Test
 
-/**
+/** 
  * @author Lorenzo Bettini
- *
  */
-public class FeatureNamePathTest {
-
-	@Test
-	public void testFeaturePath() {
-
+class FeatureNamePathTest {
+	@Test def void testFeaturePath() {
 	}
 }

tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceLoaderTest.xtend

@@ -15,7 +15,7 @@ import org.junit.Test
 import static org.junit.Assert.*
 
 class ResourceLoaderTest extends AbstractEmfParsleyTest {
-	
+
 	@Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
 
 	var TestableResourceLoader resourceLoader;
@@ -28,11 +28,9 @@ class ResourceLoaderTest extends AbstractEmfParsleyTest {
 	 * Protected methods are public so that we can test them
 	 */
 	static class TestableResourceLoader extends ResourceLoader {
-
 		override initializeEmptyResource(Resource resource) {
 			super.initializeEmptyResource(resource)
 		}
-
 	}
 
 	@Before
@@ -74,7 +72,7 @@ class ResourceLoaderTest extends AbstractEmfParsleyTest {
 		val response = getResourceFromLoader(injector)
 		assertTrue("resource should be empty", response.resource.contents.empty)
 	}
-	
+
 	@Test
 	def void testEmptyResourceIsInitializedUsingResourceManager() {
 		val injector = createInjector(new ModuleWithResourceInitializer)
@@ -98,7 +96,7 @@ class ResourceLoaderTest extends AbstractEmfParsleyTest {
 		val editingDomain = injector.createEditingDomain
 		getResourceFromLoader(injector, editingDomain)
 	}
-	
+
 	private def getResourceFromLoader(Injector injector, EditingDomain e1) {
 		val resourceSet = e1.resourceSet
 		resourceSet.setupResouceFactory