1 files changed, 4 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/utils/MatchUtilFeatureContainsTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/utils/MatchUtilFeatureContainsTest.java
index a905457db..f46559d4d 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/utils/MatchUtilFeatureContainsTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/utils/MatchUtilFeatureContainsTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2017 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2015 EclipseSource Muenchen GmbH.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,7 +7,6 @@
  * 
  * Contributors:
  *     Michael Borkowski - initial tests
- *     Philip Langer - bug 516524
  *******************************************************************************/
 package org.eclipse.emf.compare.tests.utils;
 
@@ -32,13 +31,11 @@ import org.junit.Test;
 @SuppressWarnings({"boxing", "nls" })
 public class MatchUtilFeatureContainsTest {
 
-	private static final int MOCK_FEATURE_ID = 1;
-
 	List<EObject> featureList;
 
 	InternalEObject value;
 
-	InternalEObject container;
+	EObject container;
 
 	EClass eClass;
 
@@ -48,20 +45,17 @@ public class MatchUtilFeatureContainsTest {
 	public void setUp() {
 		EPackage ePackage = mock(EPackage.class);
 
-		container = mock(InternalEObject.class);
-
+		container = mock(EObject.class);
 		feature = mock(EStructuralFeature.class);
-		when(feature.isMany()).thenReturn(true);
 
 		eClass = mock(EClass.class);
 		when(eClass.getEPackage()).thenReturn(ePackage);
-		when(eClass.getFeatureID(feature)).thenReturn(MOCK_FEATURE_ID);
 
 		when(container.eClass()).thenReturn(eClass);
 		when(feature.getEContainingClass()).thenReturn(eClass);
 
 		featureList = new LinkedList<EObject>();
-		when(container.eGet(MOCK_FEATURE_ID, false, true)).thenReturn(featureList);
+		when(container.eGet(feature, false)).thenReturn(featureList);
 
 		value = mockInternalObject();
 		featureList.add(value);