[473418] Added a service printing environment and receiver

Since variables are not in the environment they are not printed

Bug: 473418
Change-Id: I86c740e19672a510026a077ff053bd454253df25

10 files changed, 160 insertions, 75 deletions

diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/IEPackageProvider.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/IEPackageProvider.java
index cd14dd97d..42d875fc8 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/IEPackageProvider.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/IEPackageProvider.java
@@ -128,6 +128,14 @@ public interface IEPackageProvider {
 	Class<?> getClass(EClassifier eCls);
 
 	/**
+	 * Gets the {@link Set} of registered {@link EPackage}.
+	 * 
+	 * @return the {@link Set} of registered {@link EPackage}
+	 * @since 4.0.0
+	 */
+	Set<EPackage> getRegisteredEPackages();
+
+	/**
 	 * Gets the {@link EStructuralFeature} from the given {@link Set} of {@link EClass}.
 	 * 
 	 * @param receiverEClasses
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/ILookupEngine.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/ILookupEngine.java
index 3dfdf4033..eb8dcb16d 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/ILookupEngine.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/ILookupEngine.java
@@ -11,6 +11,7 @@
 package org.eclipse.acceleo.query.runtime;
 
 import java.lang.reflect.Method;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -90,4 +91,12 @@ public interface ILookupEngine {
 	 */
 	boolean isRegisteredService(Class<?> cls);
 
+	/**
+	 * Gets the mapping from registered {@link Class} to its {@link IService}.
+	 * 
+	 * @return the mapping from registered {@link Class} to its {@link IService}
+	 * @since 4.0.0
+	 */
+	Map<Class<?>, Set<IService>> getRegisteredServices();
+
 }
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EPackageProvider.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EPackageProvider.java
index 11ed193c9..129b8b30b 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EPackageProvider.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/impl/EPackageProvider.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +45,7 @@ public class EPackageProvider implements IEPackageProvider, IEPackageProvider2 {
 	/**
 	 * Map the name to their corresponding package.
 	 */
-	private Map<String, EPackage> ePackages = new HashMap<String, EPackage>();
+	private Map<String, EPackage> ePackages = new LinkedHashMap<String, EPackage>();
 
 	/**
 	 * {@link Class} to {@link EClassifier} mapping.
@@ -1061,4 +1062,14 @@ public class EPackageProvider implements IEPackageProvider, IEPackageProvider2 {
 		return result;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.acceleo.query.runtime.IEPackageProvider#getRegisteredEPackages()
+	 */
+	@Override
+	public Set<EPackage> getRegisteredEPackages() {
+		return new LinkedHashSet<EPackage>(ePackages.values());
+	}
+
 }
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/lookup/basic/BasicLookupEngine.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/lookup/basic/BasicLookupEngine.java
index d5dba9c9d..3ba74598b 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/lookup/basic/BasicLookupEngine.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/runtime/lookup/basic/BasicLookupEngine.java
@@ -20,6 +20,7 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.acceleo.query.runtime.CrossReferenceProvider;
@@ -103,12 +104,18 @@ public class BasicLookupEngine implements ILookupEngine {
 	}
 
 	/**
-	 * Gets the mapping from a {@link Class} to its {@link IService}.
-	 * 
-	 * @return the mapping from a {@link Class} to its {@link IService}
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.acceleo.query.runtime.ILookupEngine#getRegisteredServices()
 	 */
-	protected Map<Class<?>, Set<IService>> getClassToServices() {
-		return classToServices;
+	public Map<Class<?>, Set<IService>> getRegisteredServices() {
+		final Map<Class<?>, Set<IService>> result = new LinkedHashMap<Class<?>, Set<IService>>();
+
+		for (Entry<Class<?>, Set<IService>> entry : classToServices.entrySet()) {
+			result.put(entry.getKey(), new LinkedHashSet<IService>(entry.getValue()));
+		}
+
+		return result;
 	}
 
 	/**
diff --git a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/AnyServices.java b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/AnyServices.java
index 128bb3a61..f85800a82 100644
--- a/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/AnyServices.java
+++ b/query/plugins/org.eclipse.acceleo.query/src/org/eclipse/acceleo/query/services/AnyServices.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.acceleo.annotations.api.documentation.Documentation;
@@ -40,6 +41,7 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;
 
 //@formatter:off
@@ -51,6 +53,11 @@ import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;
 public class AnyServices extends AbstractServiceProvider {
 
 	/**
+	 * Line separator constant.
+	 */
+	private static final String LINE_SEP = System.getProperty("line.separator");
+
+	/**
 	 * The {@link IReadOnlyQueryEnvironment}.
 	 */
 	private final IReadOnlyQueryEnvironment queryEnvironment;
@@ -355,8 +362,7 @@ public class AnyServices extends AbstractServiceProvider {
 	@Documentation(
 		value = "Returns a string representation of the current object.",
 		params = {
-			@Param(name = "self", value = "The current object"),
-			@Param(name = "", value = "")
+			@Param(name = "self", value = "The current object")
 		},
 		result = "a String representation of the given Object. For Collections, this will be the concatenation of " +
 				 "all contained Objects' toString.",
@@ -381,4 +387,40 @@ public class AnyServices extends AbstractServiceProvider {
 		// else return empty String
 		return buffer.toString();
 	}
+
+	// @formatter:off
+	@Documentation(
+		value = "Returns a string representation of the current environment.",
+		params = {
+			@Param(name = "self", value = "The current object")
+		},
+		result = "a string representation of the current environment.",
+		examples = {
+			@Example(expression = "42.trace()", result = "'Metamodels:\n\thttp://www.eclipse.org/emf/2002/Ecore\n" +
+					"Services:\n\torg.eclipse.acceleo.query.services.AnyServices\n\t\tpublic java.lang.String org." +
+					"eclipse.acceleo.query.services.AnyServices.add(java.lang.Object,java.lang.String)\n\t\t...\nreceiver: 42\n'")
+		}
+	)
+	// @formatter:on
+	public String trace(Object object) {
+		final StringBuilder result = new StringBuilder();
+
+		result.append("Metamodels:" + LINE_SEP);
+		for (EPackage ePgk : queryEnvironment.getEPackageProvider().getRegisteredEPackages()) {
+			result.append("\t" + ePgk.getNsURI() + LINE_SEP);
+		}
+		result.append("Services:" + LINE_SEP);
+		for (Entry<Class<?>, Set<IService>> entry : queryEnvironment.getLookupEngine()
+				.getRegisteredServices().entrySet()) {
+			result.append("\t" + entry.getKey().getCanonicalName() + LINE_SEP);
+			for (IService service : entry.getValue()) {
+				result.append("\t\t" + service.getServiceMethod().toGenericString() + LINE_SEP);
+			}
+		}
+		result.append("receiver: ");
+		result.append(toString(object) + LINE_SEP);
+
+		return result.toString();
+	}
+
 }
diff --git a/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF b/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF
index 596b00648..d862a7f0f 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF
+++ b/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.acceleo.query.tests;singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Name: %pluginName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Localization: plugin
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.acceleo.query;bundle-version="3.6.0",
+ org.eclipse.acceleo.query;bundle-version="4.0.0",
  org.eclipse.emf.common,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.core.runtime,
diff --git a/query/tests/org.eclipse.acceleo.query.tests/pom.xml b/query/tests/org.eclipse.acceleo.query.tests/pom.xml
index d926b7d66..b13d89a43 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/pom.xml
+++ b/query/tests/org.eclipse.acceleo.query.tests/pom.xml
@@ -21,7 +21,7 @@
     </parent>
 
     <artifactId>org.eclipse.acceleo.query.tests</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <packaging>eclipse-test-plugin</packaging>  
 
     <build>
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/CompletionTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/CompletionTest.java
index 631775191..e0665b517 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/CompletionTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/parser/tests/CompletionTest.java
@@ -113,7 +113,7 @@ public class CompletionTest {
 	public void navigationSegmentEmptyTest() {
 		final ICompletionResult completionResult = engine.getCompletion("self.", 5, variableTypes);
 
-		assertEquals(64, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(65, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
 		assertNoVariableCompletionProposal(completionResult);
@@ -209,7 +209,7 @@ public class CompletionTest {
 
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
-		assertEquals(64, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(65, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertNoVariableCompletionProposal(completionResult);
 		assertNoVariableDeclarationCompletionProposal(completionResult);
 	}
@@ -220,7 +220,7 @@ public class CompletionTest {
 
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
-		assertEquals(52, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(53, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertNoVariableCompletionProposal(completionResult);
 		assertNoFeatureCompletionProposal(completionResult);
 		assertNoEOperationCompletionProposal(completionResult);
@@ -240,7 +240,7 @@ public class CompletionTest {
 				dotCompletionResult));
 		assertEquals("", dotCompletionResult.getPrefix());
 		assertEquals("", dotCompletionResult.getRemaining());
-		assertEquals(51, dotCompletionProposals.size());
+		assertEquals(52, dotCompletionProposals.size());
 
 		List<String> dotProposals = new ArrayList<String>();
 		for (ICompletionProposal dotCompletionProposal : dotCompletionProposals) {
@@ -272,7 +272,7 @@ public class CompletionTest {
 				.getProposals(new BasicFilter(arrowCompletionResult));
 		assertEquals("", arrowCompletionResult.getPrefix());
 		assertEquals("", arrowCompletionResult.getRemaining());
-		assertEquals(52, arrowCompletionProposals.size());
+		assertEquals(53, arrowCompletionProposals.size());
 
 		List<String> arrowProposals = new ArrayList<String>();
 		for (ICompletionProposal arrowCompletionProposal : arrowCompletionProposals) {
@@ -456,7 +456,7 @@ public class CompletionTest {
 		final ICompletionResult completionResult = engine.getCompletion(
 				"self.eClassifiers->select(p | self.)", 35, variableTypes);
 
-		assertEquals(64, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(65, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
 		assertNoVariableCompletionProposal(completionResult);
@@ -472,7 +472,7 @@ public class CompletionTest {
 		final ICompletionResult completionResult = engine.getCompletion(
 				"self.eClassifiers->select(p | self->)", 36, variableTypes);
 
-		assertEquals(52, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(53, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
 		assertNoVariableCompletionProposal(completionResult);
@@ -487,7 +487,7 @@ public class CompletionTest {
 		final ICompletionResult completionResult = engine.getCompletion(
 				"self.eClassifiers->select(w | self.eClassifiers->select(p | self.))", 65, variableTypes);
 
-		assertEquals(64, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(65, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
 		assertNoVariableCompletionProposal(completionResult);
@@ -503,7 +503,7 @@ public class CompletionTest {
 		final ICompletionResult completionResult = engine.getCompletion(
 				"self.eClassifiers->select(w | self.eClassifiers->select(p | self->))", 66, variableTypes);
 
-		assertEquals(52, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(53, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
 		assertNoVariableCompletionProposal(completionResult);
@@ -527,7 +527,7 @@ public class CompletionTest {
 		final ICompletionResult completionResult = engine.getCompletion(
 				"self->eClassifiers->filter(ecore::)", 34, variableTypes);
 
-		assertEquals(52, completionResult.getProposals(new BasicFilter(completionResult)).size());
+		assertEquals(53, completionResult.getProposals(new BasicFilter(completionResult)).size());
 		assertEquals("", completionResult.getPrefix());
 		assertEquals("", completionResult.getRemaining());
 		assertNoVariableCompletionProposal(completionResult);
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/AnyServicesTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/AnyServicesTest.java
index 7a523a206..fda0704a8 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/AnyServicesTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/services/tests/AnyServicesTest.java
@@ -27,6 +27,11 @@ import static org.junit.Assert.assertTrue;
 
 public class AnyServicesTest extends AbstractServicesTest {
 
+	/**
+	 * Line separator constant.
+	 */
+	private static final String LINE_SEP = System.getProperty("line.separator");
+
 	public AnyServices any;
 
 	@Override
@@ -424,4 +429,18 @@ public class AnyServicesTest extends AbstractServicesTest {
 		assertEquals("some string", any.toString("some string"));
 	}
 
+	@Test
+	public void trace() {
+		getQueryEnvironment().registerEPackage(EcorePackage.eINSTANCE);
+		final String result = any.trace(42);
+		assertTrue(result.contains("Metamodels:" + LINE_SEP + "\thttp://www.eclipse.org/emf/2002/Ecore"
+				+ LINE_SEP));
+		assertTrue(result.contains("Services:" + LINE_SEP));
+		assertTrue(result
+				.contains("\t\t"
+						+ "public java.lang.Boolean org.eclipse.acceleo.query.services.AnyServices.differs(java.lang.Object,java.lang.Object)"
+						+ LINE_SEP));
+		assertTrue(result.contains("receiver: 42" + LINE_SEP));
+	}
+
 }
diff --git a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/runtime/lookup/basic/LookupEngineTest.java b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/runtime/lookup/basic/LookupEngineTest.java
index 54083e3a0..88872a2fa 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/runtime/lookup/basic/LookupEngineTest.java
+++ b/query/tests/org.eclipse.acceleo.query.tests/src/org/eclipse/acceleo/query/tests/runtime/lookup/basic/LookupEngineTest.java
@@ -65,7 +65,6 @@ public class LookupEngineTest {
 
 		Map<Integer, Map<String, List<IService>>> getServices();
 
-		Map<Class<?>, Set<IService>> getClassToServices();
 	}
 
 	private static class TestBasicLookupEngine extends BasicLookupEngine implements ITestLookupEngine {
@@ -79,11 +78,6 @@ public class LookupEngineTest {
 			return super.getServices();
 		}
 
-		@Override
-		public Map<Class<?>, Set<IService>> getClassToServices() {
-			return super.getClassToServices();
-		}
-
 	}
 
 	private static class TestCacheLookupEngine extends CacheLookupEngine implements ITestLookupEngine {
@@ -97,11 +91,6 @@ public class LookupEngineTest {
 			return super.getServices();
 		}
 
-		@Override
-		public Map<Class<?>, Set<IService>> getClassToServices() {
-			return super.getClassToServices();
-		}
-
 	}
 
 	/**
@@ -341,8 +330,8 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServices1.class).size());
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServices1.class).size());
 
 		final IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestServices1.class.getMethod("service1", EClassifier.class), service.getServiceMethod());
@@ -363,8 +352,8 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestStaticServices.class).size());
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestStaticServices.class).size());
 
 		final IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestStaticServices.class.getMethod("service1", EClassifier.class), service
@@ -386,8 +375,8 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(2, engine.getClassToServices().get(ExtendedTestServices1.class).size());
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(2, engine.getRegisteredServices().get(ExtendedTestServices1.class).size());
 
 		IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(ExtendedTestServices1.class.getMethod("service1", EClassifier.class), service
@@ -419,8 +408,8 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServices1.class).size());
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServices1.class).size());
 
 		final IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestServices1.class.getMethod("service1", EClassifier.class), service.getServiceMethod());
@@ -449,9 +438,9 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(2, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServices1.class).size());
-		assertEquals(1, engine.getClassToServices().get(TestDuplicateServices1.class).size());
+		assertEquals(2, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServices1.class).size());
+		assertEquals(1, engine.getRegisteredServices().get(TestDuplicateServices1.class).size());
 
 		final IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestDuplicateServices1.class.getMethod("service1", EClassifier.class), service
@@ -483,9 +472,9 @@ public class LookupEngineTest {
 		assertEquals(expectedMaskMethod, actualMaskMethod);
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(2, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServices1.class).size());
-		assertEquals(1, engine.getClassToServices().get(TestMaskServices1.class).size());
+		assertEquals(2, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServices1.class).size());
+		assertEquals(1, engine.getRegisteredServices().get(TestMaskServices1.class).size());
 
 		IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestServices1.class.getMethod("service1", EClassifier.class), service.getServiceMethod());
@@ -518,9 +507,9 @@ public class LookupEngineTest {
 				TestServices1.class.getMethod("service1", EClassifier.class)).get(0);
 		assertEquals(expectedIsMaskedByMethod, actualIsMaskedByMethod);
 
-		assertEquals(2, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServices1.class).size());
-		assertEquals(1, engine.getClassToServices().get(TestMaskServices1.class).size());
+		assertEquals(2, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServices1.class).size());
+		assertEquals(1, engine.getRegisteredServices().get(TestMaskServices1.class).size());
 
 		IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestServices1.class.getMethod("service1", EClassifier.class), service.getServiceMethod());
@@ -543,11 +532,11 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServices1.class).size());
-		assertTrue(engine.getClassToServices().get(TestServices1.class).iterator().next()
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServices1.class).size());
+		assertTrue(engine.getRegisteredServices().get(TestServices1.class).iterator().next()
 				.getServiceInstance() instanceof TestServices1);
-		TestServices1 instance = (TestServices1)engine.getClassToServices().get(TestServices1.class)
+		TestServices1 instance = (TestServices1)engine.getRegisteredServices().get(TestServices1.class)
 				.iterator().next().getServiceInstance();
 		assertEquals(provider, instance.crossReferencer);
 
@@ -570,8 +559,8 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServicesProvider1.class).size());
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServicesProvider1.class).size());
 
 		final IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(((TestServicesProvider1)service.getServiceInstance()).service1, service);
@@ -592,8 +581,8 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(2, engine.getClassToServices().get(ExtendedTestServicesProvider1.class).size());
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(2, engine.getRegisteredServices().get(ExtendedTestServicesProvider1.class).size());
 
 		IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(ExtendedTestServicesProvider1.class.getMethod("service1", EClassifier.class), service
@@ -628,8 +617,8 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServicesProvider1.class).size());
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServicesProvider1.class).size());
 
 		final IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestServicesProvider1.class.getMethod("service1", EClassifier.class), service
@@ -661,9 +650,9 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(2, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServicesProvider1.class).size());
-		assertEquals(1, engine.getClassToServices().get(TestDuplicateServicesProvider1.class).size());
+		assertEquals(2, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServicesProvider1.class).size());
+		assertEquals(1, engine.getRegisteredServices().get(TestDuplicateServicesProvider1.class).size());
 
 		final IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestDuplicateServicesProvider1.class.getMethod("service1", EClassifier.class), service
@@ -697,9 +686,9 @@ public class LookupEngineTest {
 		assertEquals(expectedMaskMethod, actualMaskMethod);
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(2, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServicesProvider1.class).size());
-		assertEquals(1, engine.getClassToServices().get(TestMaskServicesProvider1.class).size());
+		assertEquals(2, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServicesProvider1.class).size());
+		assertEquals(1, engine.getRegisteredServices().get(TestMaskServicesProvider1.class).size());
 
 		IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestServicesProvider1.class.getMethod("service1", EClassifier.class), service
@@ -737,9 +726,9 @@ public class LookupEngineTest {
 				TestServicesProvider1.class.getMethod("service1", EClassifier.class)).get(0);
 		assertEquals(expectedIsMaskedByMethod, actualIsMaskedByMethod);
 
-		assertEquals(2, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServicesProvider1.class).size());
-		assertEquals(1, engine.getClassToServices().get(TestMaskServicesProvider1.class).size());
+		assertEquals(2, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServicesProvider1.class).size());
+		assertEquals(1, engine.getRegisteredServices().get(TestMaskServicesProvider1.class).size());
 
 		IService service = engine.lookup("service1", new Class<?>[] {EClassifier.class });
 		assertEquals(TestServicesProvider1.class.getMethod("service1", EClassifier.class), service
@@ -766,11 +755,11 @@ public class LookupEngineTest {
 		assertEquals(0, result.getMasked().size());
 		assertEquals(0, result.getIsMaskedBy().size());
 
-		assertEquals(1, engine.getClassToServices().size());
-		assertEquals(1, engine.getClassToServices().get(TestServicesProvider1.class).size());
-		assertTrue(engine.getClassToServices().get(TestServicesProvider1.class).iterator().next()
+		assertEquals(1, engine.getRegisteredServices().size());
+		assertEquals(1, engine.getRegisteredServices().get(TestServicesProvider1.class).size());
+		assertTrue(engine.getRegisteredServices().get(TestServicesProvider1.class).iterator().next()
 				.getServiceInstance() instanceof TestServicesProvider1);
-		TestServicesProvider1 instance = (TestServicesProvider1)engine.getClassToServices().get(
+		TestServicesProvider1 instance = (TestServicesProvider1)engine.getRegisteredServices().get(
 				TestServicesProvider1.class).iterator().next().getServiceInstance();
 		assertEquals(provider, instance.crossReferencer);
 
@@ -827,7 +816,7 @@ public class LookupEngineTest {
 
 		engine.removeServices(ExtendedTestServices1.class);
 
-		assertEquals(0, engine.getClassToServices().size());
+		assertEquals(0, engine.getRegisteredServices().size());
 		assertEquals(0, engine.getServices().size());
 	}
 
@@ -838,12 +827,12 @@ public class LookupEngineTest {
 
 		engine.registerServices(ExtendedTestServices1.class);
 
-		assertEquals(1, engine.getClassToServices().size());
+		assertEquals(1, engine.getRegisteredServices().size());
 		assertEquals(1, engine.getServices().size());
 
 		engine.removeServices(ExtendedTestServices1.class);
 
-		assertEquals(0, engine.getClassToServices().size());
+		assertEquals(0, engine.getRegisteredServices().size());
 		assertEquals(0, engine.getServices().size());
 	}