466219: refactoring of tests
Change-Id: Ib5bfe5fdd8b3863e5a75806be5aa06096a8df4c8
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=466219
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractControlFactoryTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractControlFactoryTest.xtend
index 99a5ef9..1bf35ff 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractControlFactoryTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractControlFactoryTest.xtend
@@ -11,12 +11,12 @@
package org.eclipse.emf.parsley.tests
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyControlBasedTest
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.junit.Rule
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
abstract class AbstractControlFactoryTest extends AbstractEmfParsleyControlBasedTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
override protected getEditingDomain() {
return fixtures.editingDomain
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractImageBasedTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractImageBasedTest.xtend
index 8b235e5..0ca31fa 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractImageBasedTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/AbstractImageBasedTest.xtend
@@ -13,14 +13,14 @@
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyShellBasedTest
import org.eclipse.emf.parsley.runtime.ui.IImageHelper
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.junit.Rule
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
abstract class AbstractImageBasedTest extends AbstractEmfParsleyShellBasedTest {
val protected TEST_IMAGE = "test_image.png"
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
def protected getDelegateLabelProvider() {
getOrCreateInjector.getInstance(AdapterFactoryLabelProvider)
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ConfiguratorTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ConfiguratorTest.xtend
index c75b4b9..87afac5 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ConfiguratorTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ConfiguratorTest.xtend
@@ -9,12 +9,12 @@
import static extension org.junit.Assert.*
import org.junit.Rule
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class ConfiguratorTest extends AbstractEmfParsleyTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Test
def void testDefaultResourceURI() {
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/DialogFeatureCaptionProviderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/DialogFeatureCaptionProviderTest.xtend
index 5625aa3..62e7576 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/DialogFeatureCaptionProviderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/DialogFeatureCaptionProviderTest.xtend
@@ -12,7 +12,6 @@
import org.eclipse.emf.ecore.EStructuralFeature
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyShellBasedTest
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.ui.provider.DialogFeatureCaptionProvider
import org.eclipse.emf.parsley.ui.provider.FeatureCaptionProvider
import org.eclipse.swt.widgets.Composite
@@ -21,10 +20,11 @@
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class DialogFeatureCaptionProviderTest extends AbstractEmfParsleyShellBasedTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Test def void testDefaultText() {
val provider = new DialogFeatureCaptionProvider() => [initialize]
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingDomainTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingDomainTest.xtend
index dd4d67a..338e878 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingDomainTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingDomainTest.xtend
@@ -18,16 +18,16 @@
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
import org.eclipse.emf.parsley.resource.ResourceLoader
import org.eclipse.emf.parsley.tests.models.testmodels.ClassWithName
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.tests.util.GlobalAdapterFactoryEditingDomainModule
import org.junit.Rule
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class EditingDomainTest extends AbstractEmfParsleyTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Test
def void testDefaultEditingDomainProvider() {
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingMenuBuilderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingMenuBuilderTest.xtend
index e408996..72c452f 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingMenuBuilderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EditingMenuBuilderTest.xtend
@@ -8,7 +8,6 @@
import org.eclipse.emf.parsley.examples.library.Library
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
import org.eclipse.emf.parsley.tests.models.testmodels.ClassForControls
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.util.EmfParsleyUtil
import org.eclipse.jface.action.ActionContributionItem
import org.eclipse.jface.action.IContributionItem
@@ -21,10 +20,11 @@
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class EditingMenuBuilderTest extends AbstractEmfParsleyTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
var EditingDomain editingDomain = null
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfCopyTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfCopyTest.xtend
index 286adec..69207f4 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfCopyTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/EmfCopyTest.xtend
@@ -11,16 +11,16 @@
package org.eclipse.emf.parsley.tests
import org.eclipse.emf.parsley.examples.library.EXTLibraryPackage
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.util.EcoreUtil2
import org.junit.Rule
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class EmfCopyTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Test def void testCloneDoesNotCopyBidirectional() {
writer.books.size.assertEquals(1)
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeatureCaptionProviderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeatureCaptionProviderTest.xtend
index aa846d0..42fa207 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeatureCaptionProviderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeatureCaptionProviderTest.xtend
@@ -11,16 +11,16 @@
package org.eclipse.emf.parsley.tests
import org.eclipse.emf.ecore.EStructuralFeature
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.ui.provider.FeatureCaptionProvider
import org.junit.Rule
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class FeatureCaptionProviderTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Test def void testDefault() {
val provider = new FeatureCaptionProvider()
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeaturesProviderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeaturesProviderTest.xtend
index 84daa92..18ce40b 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeaturesProviderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FeaturesProviderTest.xtend
@@ -17,7 +17,6 @@
import org.eclipse.emf.parsley.examples.library.EXTLibraryPackage
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
import org.eclipse.emf.parsley.junit4.util.LogAppenderTestRule
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.ui.provider.EClassToEStructuralFeatureAsStringsMap
import org.eclipse.emf.parsley.ui.provider.FeaturesProvider
import org.junit.Before
@@ -25,6 +24,7 @@
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class FeaturesProviderTest extends AbstractEmfParsleyTest {
@@ -32,7 +32,7 @@
@Rule public val LogAppenderTestRule logAppender = new LogAppenderTestRule(EmfParsleyActivator);
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Before
def void setUpFeaturesProvider() {
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FormFeatureCaptionProviderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FormFeatureCaptionProviderTest.xtend
index 19307e9..ea2824e 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FormFeatureCaptionProviderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/FormFeatureCaptionProviderTest.xtend
@@ -13,7 +13,6 @@
import org.eclipse.emf.ecore.EStructuralFeature
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyShellBasedTest
import org.eclipse.emf.parsley.tests.models.testmodels.TestmodelsPackage
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.ui.provider.FeatureCaptionProvider
import org.eclipse.emf.parsley.ui.provider.FormFeatureCaptionProvider
import org.eclipse.swt.widgets.Composite
@@ -25,10 +24,11 @@
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class FormFeatureCaptionProviderTest extends AbstractEmfParsleyShellBasedTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
val testPackage = TestmodelsPackage.eINSTANCE
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/NotificationBufferTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/NotificationBufferTest.xtend
index 2c7ebd8..7f16f9c 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/NotificationBufferTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/NotificationBufferTest.xtend
@@ -11,13 +11,13 @@
package org.eclipse.emf.parsley.tests
import org.eclipse.emf.parsley.edit.NotificationBuffer
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.tests.util.TestAdapter
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class NotificationBufferTest {
@@ -27,7 +27,7 @@
protected TestAdapter adapter2
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Before
def void setUp() {
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/PolymorphicDispatcherTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/PolymorphicDispatcherTest.xtend
index d1e0e0b..b00e202 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/PolymorphicDispatcherTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/PolymorphicDispatcherTest.xtend
@@ -13,7 +13,6 @@
import org.eclipse.emf.ecore.EClass
import org.eclipse.emf.ecore.EStructuralFeature
import org.eclipse.emf.parsley.runtime.util.PolymorphicDispatcherExtensions
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.junit.Rule
import org.junit.Test
@@ -21,6 +20,7 @@
import static extension org.eclipse.emf.parsley.runtime.util.PolymorphicDispatcherExtensions.*
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class PolymorphicDispatcherTest {
@@ -30,7 +30,7 @@
val static IN_DERIVED_CLASS = "DerivedClass.baseClassFeature"
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
static class Customize_BaseClass_baseClassFeature {
def String text_BaseClass_baseClassFeature(EStructuralFeature feature) {
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ProposalCreatorTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ProposalCreatorTest.xtend
index 51d8700..0f93f4e 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ProposalCreatorTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ProposalCreatorTest.xtend
@@ -16,19 +16,19 @@
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
import org.eclipse.emf.parsley.tests.models.testmodels.BaseClass
import org.eclipse.emf.parsley.tests.models.testmodels.ClassForControls
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.jface.viewers.ILabelProvider
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class ProposalCreatorTest extends AbstractEmfParsleyTest {
var ProposalCreator defaultProposalCreator
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
@Before
def void setupEObject() {
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceLoaderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceLoaderTest.xtend
index 3dfb2be..efc32a0 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceLoaderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceLoaderTest.xtend
@@ -5,7 +5,6 @@
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
import org.eclipse.emf.parsley.resource.ResourceLoader
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.emf.parsley.tests.util.ModuleWithResourceInitializer
import org.junit.Before
import org.junit.Rule
@@ -13,10 +12,11 @@
import static org.junit.Assert.*
import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class ResourceLoaderTest extends AbstractEmfParsleyTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
var TestableResourceLoader resourceLoader;
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceSaveStrategyTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceSaveStrategyTest.xtend
index fc344c6..4c69321 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceSaveStrategyTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ResourceSaveStrategyTest.xtend
@@ -1,10 +1,9 @@
package org.eclipse.emf.parsley.tests
-import org.eclipse.emf.common.util.URI
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
import org.eclipse.emf.parsley.resource.ResourceSaveStrategy
import org.eclipse.emf.parsley.tests.models.testmodels.TestmodelsFactory
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
import org.junit.Before
import org.junit.Rule
import org.junit.Test
@@ -13,12 +12,10 @@
class ResourceSaveStrategyTest extends AbstractEmfParsleyTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
var ResourceSaveStrategy resourceSaveStrategy;
- val static TEST_RESOURCE_URI = "resources/TestResource.xmi"
-
@Before
def void setupResourceLoader() {
// note that members must be explicitly injected in the tests
@@ -37,15 +34,4 @@
assertEquals(1, resource.contents.size)
}
- def private createTestResource() {
- val resourceSet = createAndSetupResourceSet
- val resource = resourceSet.createResource(URI.createURI(TEST_RESOURCE_URI))
- return resource
- }
-
- def private loadTestResource() {
- val resourceSet = createAndSetupResourceSet
- val resource = resourceSet.getResource(URI.createURI(TEST_RESOURCE_URI), true)
- return resource
- }
}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ViewerContentProviderTest.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ViewerContentProviderTest.xtend
index 98ac42e..7f5e462 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ViewerContentProviderTest.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/ViewerContentProviderTest.xtend
@@ -13,17 +13,17 @@
import org.eclipse.emf.parsley.edit.ui.provider.ViewerContentProvider
import org.eclipse.emf.parsley.junit4.AbstractEmfParsleyTest
import org.eclipse.emf.parsley.tests.models.testmodels.TestContainer
-import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesTestRule
import org.eclipse.jface.viewers.ILabelProvider
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import static extension org.junit.Assert.*
+import org.eclipse.emf.parsley.tests.util.EmfParsleyFixturesAndUtilitiesTestRule
class ViewerContentProviderTest extends AbstractEmfParsleyTest {
- @Rule public extension EmfParsleyFixturesTestRule fixtures = new EmfParsleyFixturesTestRule()
+ @Rule public extension EmfParsleyFixturesAndUtilitiesTestRule fixtures = new EmfParsleyFixturesAndUtilitiesTestRule()
var ViewerContentProvider contentProvider
diff --git a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/util/EmfParsleyFixturesTestRule.xtend b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/util/EmfParsleyFixturesAndUtilitiesTestRule.xtend
similarity index 90%
rename from tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/util/EmfParsleyFixturesTestRule.xtend
rename to tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/util/EmfParsleyFixturesAndUtilitiesTestRule.xtend
index 79a0dcb..0bd43a5 100644
--- a/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/util/EmfParsleyFixturesTestRule.xtend
+++ b/tests/org.eclipse.emf.parsley.tests/src/org/eclipse/emf/parsley/tests/util/EmfParsleyFixturesAndUtilitiesTestRule.xtend
@@ -12,6 +12,7 @@
import com.google.inject.Injector
import java.util.List
+import org.eclipse.emf.common.util.URI
import org.eclipse.emf.ecore.resource.Resource
import org.eclipse.emf.ecore.resource.ResourceSet
import org.eclipse.emf.ecore.resource.impl.ResourceImpl
@@ -38,12 +39,12 @@
import static extension org.junit.Assert.*
/**
- * Objects and other elements used in tests.
+ * Objects, utility methods and other elements used in tests.
*
* @author Lorenzo Bettini - Initial contribution and API
*
*/
-class EmfParsleyFixturesTestRule implements TestRule {
+class EmfParsleyFixturesAndUtilitiesTestRule implements TestRule {
protected Library lib = null
@@ -75,6 +76,8 @@
* An instance to use for testing Ecore related mechanisms
*/
var protected TestEClass testEClassInstance
+
+ val static TEST_RESOURCE_URI = "resources/TestResource.xmi"
override apply(Statement base, Description description) {
return [
@@ -241,4 +244,16 @@
def createAndSetupResourceSet() {
createResourceSet.setupResouceFactory
}
+
+ def createTestResource() {
+ val resourceSet = createAndSetupResourceSet
+ val resource = resourceSet.createResource(URI.createURI(TEST_RESOURCE_URI))
+ return resource
+ }
+
+ def loadTestResource() {
+ val resourceSet = createAndSetupResourceSet
+ val resource = resourceSet.getResource(URI.createURI(TEST_RESOURCE_URI), true)
+ return resource
+ }
}
\ No newline at end of file
