Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Eysholdt2014-04-10 10:03:26 +0000
committerMoritz Eysholdt2014-04-10 10:14:49 +0000
commite249ebf1c6126b097b2de95d04536b595509f0f2 (patch)
treef177ed084a26726b5e0301522c8f04a3e37203f0 /tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation
parent024253a736ce64a008bef70474ecb5fe667b32bc (diff)
downloadorg.eclipse.emf-e249ebf1c6126b097b2de95d04536b595509f0f2.tar.gz
org.eclipse.emf-e249ebf1c6126b097b2de95d04536b595509f0f2.tar.xz
org.eclipse.emf-e249ebf1c6126b097b2de95d04536b595509f0f2.zip
moved the legacy impl of Xpect to test.ecore.xcore because it has been deleted from Xtext
For the removal from Xtext, see http://git.eclipse.org/c/tmf/org.eclipse.xtext.git/commit/?id=5d0f6a026c563d4af0cc0958dcc82b59d3ccebcf and https://bugs.eclipse.org/bugs/show_bug.cgi?id=406198 Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
Diffstat (limited to 'tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation')
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreParameterizedTestRunner.java3
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java6
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreParameterizedTestRunner.java b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreParameterizedTestRunner.java
index 0ca0512dc..707a6876d 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreParameterizedTestRunner.java
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreParameterizedTestRunner.java
@@ -12,8 +12,8 @@ import java.util.List;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.test.ecore.xcore.legacy_xpect_runner.ParameterizedXtextRunner;
import org.eclipse.xtext.junit4.IInjectorProvider;
-import org.eclipse.xtext.junit4.parameterized.ParameterizedXtextRunner;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.resource.XtextResourceFactory;
import org.junit.runners.model.InitializationError;
@@ -23,7 +23,6 @@ import com.google.common.collect.Lists;
import com.google.inject.Injector;
-@SuppressWarnings("restriction")
public class XcoreParameterizedTestRunner extends ParameterizedXtextRunner
{
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java
index 88672fd77..4ef1c0b59 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java
@@ -12,10 +12,10 @@ import java.util.List;
import org.eclipse.emf.ecore.util.EcoreValidator;
import org.eclipse.emf.ecore.xcore.XcoreInjectorProvider;
+import org.eclipse.emf.test.ecore.xcore.legacy_xpect_runner.InjectParameter;
+import org.eclipse.emf.test.ecore.xcore.legacy_xpect_runner.ResourceURIs;
+import org.eclipse.emf.test.ecore.xcore.legacy_xpect_runner.XpectLines;
import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.parameterized.InjectParameter;
-import org.eclipse.xtext.junit4.parameterized.ResourceURIs;
-import org.eclipse.xtext.junit4.parameterized.XpectLines;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.util.CancelIndicator;
import org.eclipse.xtext.validation.CheckMode;

Back to the top