Fix false positives in inferClassRenameBasedOnFilePaths() when the

UMLClassRenameDiff used for inference corresponds to inner classes junit-team/junit5@89a0201
tsantalis · Jan 15, 2025 · 66f2733 · 66f2733
1 parent f6d8175
commit 66f2733
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/gr/uom/java/xmi/UMLAbstractClass.java b/src/main/java/gr/uom/java/xmi/UMLAbstractClass.java
@@ -820,6 +820,9 @@ else if(operation.isConstructor() && commonTokens >= Math.max(tokens1.length, to
 			if(commonOperations.size() > Math.floor(totalOperations/2.0) || commonOperations.containsAll(this.operations)) {
 				return new MatchResult(commonOperations.size(), commonAttributes.size(), identicalOperations.size(), totalOperations, totalAttributes, true);
 			}
+			else if(commonAttributes.size() == totalAttributes && totalAttributes > 0 && commonOperations.size() > 0) {
+				return new MatchResult(commonOperations.size(), commonAttributes.size(), identicalOperations.size(), totalOperations, totalAttributes, true);
+			}
 			else {
 				return new MatchResult(commonOperations.size(), commonAttributes.size(), identicalOperations.size(), totalOperations, totalAttributes, false);
 			}

diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java
@@ -1272,7 +1272,8 @@ public void inferClassRenameBasedOnFilePaths(UMLClassMatcher matcher) throws Ref
 				UMLClass addedClass = addedClassIterator.next();
 				String addedClassFilePath = addedClass.getSourceFile();
 				for(UMLClassRenameDiff classRenameDiff : classRenameDiffList) {
-					if(classRenameDiff.getOriginalClass().getSourceFile().equals(removedClassFilePath) &&
+					if(classRenameDiff.getOriginalClass().isTopLevel() && classRenameDiff.getNextClass().isTopLevel() &&
+							classRenameDiff.getOriginalClass().getSourceFile().equals(removedClassFilePath) &&
 							classRenameDiff.getNextClass().getSourceFile().equals(addedClassFilePath)) {
 						MatchResult matchResult = matcher.match(removedClass, addedClass);
 						if(matchResult.getMatchedOperations() > 0 || matchResult.getMatchedAttributes() > 0) {