Merge pull request #726 from moosetechnology/723-overridingMethods-on-Java-interface-methods-does-not-work-properly

Fix #723

Author: ISayarLu

src/Famix-Java-Entities/FamixJavaInterface.class.st

@@ -63,16 +63,20 @@ FamixJavaInterface class >> annotation [
 { #category : #private }
 FamixJavaInterface >> addMethodOverriding: aMethod in: aCollection [
 
-	(self implementations collect: #implementingClass) do: [
-		:implementingClass |
-		implementingClass addMethodOverriding: aMethod in: aCollection ].
+	self implementations do: [ :implementation |
+		| implClass |
+		implClass := implementation implementingClass.
+		implClass methods
+			detect: [ :method | method signature = aMethod signature ]
+			ifFound: [ :overridingMethod | aCollection add: overridingMethod ].
+		implClass addMethodOverriding: aMethod in: aCollection ].
 
 	self directSubclasses do: [ :subInterface |
 		subInterface methods
 			detect: [ :method | method signature = aMethod signature ]
-			ifFound: [ :overridingMethod | aCollection add: overridingMethod ]
-			ifNone: [
-			subInterface addMethodOverriding: aMethod in: aCollection ] ]
+			ifFound: [ :overridingMethod | aCollection add: overridingMethod ].
+
+		subInterface addMethodOverriding: aMethod in: aCollection ]
 ]
 
 { #category : #testing }

src/Famix-Java-Tests/FamixJavaMethodTest.class.st

@@ -44,6 +44,74 @@ FamixJavaMethodTest >> testAllOverridingMethods [
 				otherOverridingMethod }
 ]
 
+{ #category : #tests }
+FamixJavaMethodTest >> testAllOverridingMethodsInInterface [
+
+	| signature overridingMethod otherOverridingMethod i subclass subSubclass |
+	signature := 'javaMethod()'.
+	method signature: signature.
+	overridingMethod := FamixJavaMethod new signature: signature.
+	otherOverridingMethod := FamixJavaMethod new signature: signature.
+
+	i := FamixJavaInterface new.
+	subclass := FamixJavaClass new.
+	subSubclass := FamixJavaClass new.
+
+	i addMethod: method.
+	subclass addMethod: overridingMethod.
+	subSubclass addMethod: otherOverridingMethod.
+
+	FamixJavaImplementation new
+		interface: i;
+		implementingClass: subclass.
+	FamixJavaInheritance new
+		superclass: subclass;
+		subclass: subSubclass.
+
+	self assertCollection: method overridingMethods hasSameElements: {
+			overridingMethod.
+			otherOverridingMethod }
+]
+
+{ #category : #tests }
+FamixJavaMethodTest >> testAllOverridingMethodsInInterfaceWithExtendingInterface [
+
+	| signature overridingMethod otherOverridingMethod i subclass subSubclass i2 |
+	signature := 'javaMethod()'.
+	method signature: signature.
+	overridingMethod := FamixJavaMethod new signature: signature.
+	otherOverridingMethod := FamixJavaMethod new signature: signature.
+
+	i := FamixJavaInterface new
+		     name: 'i';
+		     yourself.
+	i2 := FamixJavaInterface new
+		      name: 'i2';
+		      yourself.
+
+	subclass := FamixJavaClass new.
+	subSubclass := FamixJavaClass new.
+
+	i addMethod: method.
+	subclass addMethod: overridingMethod.
+	subSubclass addMethod: otherOverridingMethod.
+
+	FamixJavaInheritance new
+		superclass: i;
+		subclass: i2.
+	FamixJavaImplementation new
+		interface: i2;
+		implementingClass: subclass.
+
+	FamixJavaInheritance new
+		superclass: subclass;
+		subclass: subSubclass.
+
+	self assertCollection: method overridingMethods hasSameElements: {
+			overridingMethod.
+			otherOverridingMethod }
+]
+
 { #category : #tests }
 FamixJavaMethodTest >> testDefaultIsStub [
 	self deny: method isStub
@@ -272,6 +340,58 @@ FamixJavaMethodTest >> testOverridingMethods [
 		hasSameElements: { overridingMethod }
 ]
 
+{ #category : #tests }
+FamixJavaMethodTest >> testOverridingMethodsInInterface [
+
+	| signature overridingMethod i c |
+	signature := 'javaMethod()'.
+	method signature: signature.
+	overridingMethod := FamixJavaMethod new signature: signature.
+
+	i := FamixJavaInterface new.
+	c := FamixJavaClass new.
+
+	i addMethod: method.
+	c addMethod: overridingMethod.
+
+	FamixJavaImplementation new
+		interface: i;
+		implementingClass: c.
+
+	self
+		assertCollection: method overridingMethods
+		hasSameElements: { overridingMethod }
+]
+
+{ #category : #tests }
+FamixJavaMethodTest >> testOverridingMethodsInterfaceExtendsInterface [
+
+	| signature overridingMethod i i2 overridingMethod2 i3 |
+	signature := 'javaMethod()'.
+	method signature: signature.
+	overridingMethod := FamixJavaMethod new signature: signature.
+	overridingMethod2 := FamixJavaMethod new signature: signature.
+
+	i := FamixJavaInterface new.
+	i2 := FamixJavaInterface new.
+	i3 := FamixJavaInterface new.
+	i addMethod: method.
+	i2 addMethod: overridingMethod.
+	i3 addMethod: overridingMethod2.
+
+	FamixJavaInheritance new
+		superclass: i;
+		subclass: i2.
+	
+	FamixJavaInheritance new
+		superclass: i2;
+		subclass: i3.
+	
+	self assertCollection: method overridingMethods hasSameElements: {
+			overridingMethod.
+			overridingMethod2 }
+]
+
 { #category : #tests }
 FamixJavaMethodTest >> testSettingIsStub [
 	method isStub: true.