104: cleaned EdeltaCompilerUtil

Task-Url: http://github.com/LorenzoBettini/edelta/issues/104
LorenzoBettini · Jan 24, 2020 · c23c55b · c23c55b
1 parent 590789f
commit c23c55b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/edelta.parent/edelta.tests/src/edelta/tests/EdeltaCompilerUtilTest.xtend b/edelta.parent/edelta.tests/src/edelta/tests/EdeltaCompilerUtilTest.xtend
@@ -8,13 +8,24 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 import static extension org.junit.Assert.*
+import org.eclipse.emf.ecore.EcoreFactory
 
 @RunWith(XtextRunner)
 @InjectWith(EdeltaInjectorProviderCustom)
 class EdeltaCompilerUtilTest extends EdeltaAbstractTest {
 
 	@Inject extension EdeltaCompilerUtil
 
+	@Test
+	def void testGetEPackageNameOrNull() {
+		val factory = EcoreFactory.eINSTANCE
+		null.EPackageNameOrNull.assertNull
+		val p = factory.createEPackage => [
+			name = "test"
+		]
+		"test".assertEquals(p.EPackageNameOrNull)
+	}
+
 	@Test
 	def void testGetStringForEcoreReferenceExpressionEClass() {
 		'''ecoreref(FooClass)'''.ecoreReferenceExpression => [

diff --git a/edelta.parent/edelta/src/edelta/compiler/EdeltaCompilerUtil.xtend b/edelta.parent/edelta/src/edelta/compiler/EdeltaCompilerUtil.xtend
@@ -5,7 +5,6 @@ import edelta.edelta.EdeltaEcoreReference
 import edelta.edelta.EdeltaEcoreReferenceExpression
 import edelta.util.EdeltaEcoreReferenceInformationHelper
 import java.util.List
-import org.eclipse.emf.ecore.ENamedElement
 import org.eclipse.emf.ecore.EPackage
 
 /**
@@ -21,10 +20,6 @@ class EdeltaCompilerUtil {
 		e?.name
 	}
 
-	def String getNameOrNull(ENamedElement e) {
-		e?.name
-	}
-
 	def getStringForEcoreReferenceExpression(EdeltaEcoreReferenceExpression e) {
 		val reference = e.reference
 		if (reference === null || reference.enamedelement === null)