Browse Source

Fixed imports, so deprecated stuff is not being used.

Casper Thule 4 years ago
parent
commit
a818f659cd

+ 4 - 2
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/META-INF/MANIFEST.MF

@@ -10,9 +10,11 @@ Require-Bundle: be.uantwerpen.ansymo.semanticadaptation,
  org.eclipse.xtext.junit4,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.jdt.core
+ org.eclipse.jdt.core,
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.xbase.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: be.uantwerpen.ansymo.semanticadaptation.tests
+Export-Package: be.uantwerpen.ansymo.semanticadaptation.tests;x-internal=true
 Import-Package: org.hamcrest.core,
  org.junit;version="4.5.0",
  org.junit.runners.model;version="4.5.0",

+ 3 - 3
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/AbstractSemanticAdaptationParserTest.xtend

@@ -5,10 +5,10 @@ package be.uantwerpen.ansymo.semanticadaptation.tests
 
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.SemanticAdaptation
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.eclipse.xtext.junit4.util.ParseHelper
 import org.junit.runner.RunWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.util.ParseHelper
 
 @RunWith(XtextRunner)
 @InjectWith(SemanticAdaptationInjectorProvider)

+ 8 - 10
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/AbstractSemanticAdaptationTest.xtend

@@ -3,21 +3,19 @@
  */
 package be.uantwerpen.ansymo.semanticadaptation.tests
 
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.junit.runner.RunWith
+import java.io.File
 import java.io.FileReader
-import static extension com.google.common.io.CharStreams.*
 import java.util.ArrayList
-import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.common.util.BasicEList
+import org.eclipse.emf.common.util.EList
+import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.util.EDataTypeEList
 import org.eclipse.emf.ecore.util.EObjectEList
-import org.eclipse.emf.common.util.EList
-import org.eclipse.xtext.generator.InMemoryFileSystemAccess
-import javax.inject.Inject
-import java.io.File
-import org.eclipse.emf.ecore.resource.ResourceSet
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.junit.runner.RunWith
+
+import static extension com.google.common.io.CharStreams.*
 
 @RunWith(XtextRunner)
 @InjectWith(SemanticAdaptationInjectorProvider)

+ 3 - 3
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/SemanticAdaptationGeneratorTest.xtend

@@ -4,12 +4,12 @@
 package be.uantwerpen.ansymo.semanticadaptation.tests
 
 import org.junit.Test
-import org.eclipse.xtext.xbase.compiler.CompilationTestHelper
 import com.google.inject.Inject
 import org.junit.runner.RunWith
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
 import java.io.File
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.xbase.testing.CompilationTestHelper
 
 @RunWith(XtextRunner)
 @InjectWith(SemanticAdaptationInjectorProvider)

+ 8 - 9
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.tests/src/be/uantwerpen/ansymo/semanticadaptation/tests/SemanticAdaptationParsingTest.xtend

@@ -3,17 +3,16 @@
  */
 package be.uantwerpen.ansymo.semanticadaptation.tests
 
-import org.eclipse.xtext.junit4.InjectWith
-import org.eclipse.xtext.junit4.XtextRunner
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.eclipse.xtext.junit4.util.ParseHelper
+import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.SemanticAdaptation
 import com.google.inject.Inject
-import org.eclipse.xtext.junit4.validation.ValidationTestHelper
-import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.*
-import org.eclipse.emf.ecore.EObject
 import java.util.regex.Pattern
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.XtextRunner
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
+import org.junit.Test
+import org.junit.runner.RunWith
 
 @RunWith(XtextRunner)
 @InjectWith(SemanticAdaptationInjectorProvider)